Merged revisions 123113 via svnmerge from