message: Merging post 2.6.7rc2 changes from Subversion.
Attach a file by drag & drop or click to upload
