Merge pull request #259 from mhaskel/merge_1.3.x_to_master
authorBryan Jen <bryan.jen@gmail.com>
Thu, 30 Jul 2015 23:25:48 +0000 (16:25 -0700)
committerBryan Jen <bryan.jen@gmail.com>
Thu, 30 Jul 2015 23:25:48 +0000 (16:25 -0700)
Merge 1.3.x to master


Trivial merge