Merged revisions 140417 via svnmerge from