Merge pull request #251 from mhaskel/merge_1.3.x_to_master
authorBryan Jen <bryan.jen@gmail.com>
Thu, 21 May 2015 19:50:20 +0000 (12:50 -0700)
committerBryan Jen <bryan.jen@gmail.com>
Thu, 21 May 2015 19:50:20 +0000 (12:50 -0700)
Merge 1.3.x to master


Trivial merge