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)
commitb2e6ba8781408992038a3457877841a315762460
treef0fdc3625b1d1d5342b67b39233dfd1e5af443ca
parentd86edc66c817e13976b7849d077db28e45f33f4b
parentf1a5499541c893ffb18e591bcb857c78e3001c24
Merge pull request #535 from mhaskel/merge_2.1.x_to_master

Merge 2.1.x to master