Merged revisions 130102 via svnmerge from