1.3.0 prep
Merge pull request #443 from mhaskel/1.3.0-prep

1.3.0 prep
Merge pull request #444 from mhaskel/merge_1.3.x_into_master

Merge 1.3.x into master