sync git with svn

this should be the last one for master.