Fixed svn merge property breakage from r377986