backport. closes #460, #552
Merge pull request #1516 from stevepiercy/1.3-branch

backport. closes #460, #552