Merge from Subversion r50.