Merge pull request #444 from mhaskel/merge_1.3.x_into_master
authorColleen Murphy <cmurphy@users.noreply.github.com>
Wed, 17 Dec 2014 01:07:12 +0000 (17:07 -0800)
committerColleen Murphy <cmurphy@users.noreply.github.com>
Wed, 17 Dec 2014 01:07:12 +0000 (17:07 -0800)
Merge 1.3.x into master


Trivial merge