backport. closes #460, #552
Merge pull request #1515 from stevepiercy/1.2-branch

backport. closes #460, #552