Merged revisions 110618 via svnmerge from