further fix to #1957
sacrificing a goat to ensure this doesn't come back to bite me
Merge remote-tracking branch 'origin/master' into 0.5.1