Merge pull request #535 from mhaskel/merge_2.1.x_to_master
authorBryan Jen <bryan.jen@gmail.com>
Tue, 16 Jun 2015 22:21:41 +0000 (15:21 -0700)
committerBryan Jen <bryan.jen@gmail.com>
Tue, 16 Jun 2015 22:21:41 +0000 (15:21 -0700)
Merge 2.1.x to master


Trivial merge