accidentally omitted from 2012-04-12 backport from trunk. (Do not merge to trunk.)
Attach a file by drag & drop or click to upload
