Merged revisions 160207 via svnmerge from