Merged revisions 176249,176252 via svnmerge from