emergency patch from Chris Travers
Merge remote-tracking branch 'origin/master13' into master13