This commit was SVN r4978. The following SVN revisions from the original message are invalid or inconsistent and therefore were not cross-referenced: r4977
