backport. closes #460, #552
Merge pull request #1517 from stevepiercy/1.1-branch

backport. closes #460, #552