Merged revisions 288079-288080 via svnmerge from