Copied r46 from SVN in git