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

1.3.0 prep