Merge pull request #2084 from sjinks/1.3.0

Fix #2081
Fix #2085
Merge branch '1.3.0' into all-fixes