Merge pull request #1311 from sjinks/1.3.0

Revert d89c1de