hotfix/2014-11-20c

This contains a single commit addressing PLAT-297, reviewed in #5990. @dmitchell, FYI.