message: Cross-port changes for 2.6.7rc2 from the Subversion branch.
Attach a file by drag & drop or click to upload
