Merge pull request #2084 from sjinks/1.3.0

Fix #2081