Merged revisions 131012 via svnmerge from