Merged revisions 130514 via svnmerge from