backport. closes #460, #552
Merge pull request #1518 from stevepiercy/1.0-branch

backport. closes #460, #552