merge upstream/master into andrew/bispinor

This commit is contained in:
Andrew Meadows 2015-01-20 08:29:37 -08:00
commit aa0f5d1bb1

Diff content is not available