Merge pull request #360
Excluding the merge/revert of #359 on the 1.2.x branch from mergeback into master.