Merge pull request #550 from mhaskel/2.1.1-prep
authorBryan Jen <bryan.jen@gmail.com>
Thu, 23 Jul 2015 00:32:38 +0000 (17:32 -0700)
committerBryan Jen <bryan.jen@gmail.com>
Thu, 23 Jul 2015 00:32:38 +0000 (17:32 -0700)
2.1.1 prep


Trivial merge