Import upstream svn r56 changes and merge.