Merged revisions 110614 via svnmerge from