Merge pull request #549 from mhaskel/merge_master_to_2.1.x
authorBryan Jen <bryan.jen@gmail.com>
Wed, 22 Jul 2015 23:51:27 +0000 (16:51 -0700)
committerBryan Jen <bryan.jen@gmail.com>
Wed, 22 Jul 2015 23:51:27 +0000 (16:51 -0700)
Merge master to 2.1.x


Trivial merge