Issue #182: Backport SA-CORE-2012-004.
Merge branch '1.x' into SA-CORE-2012-004
Merge pull request #165 from quicksketch/SA-CORE-2012-004

Issue #182: Backport SA-CORE-2012-004.