Merge from Trunk up to revision 677588. Switched from svnmerge to SVN 1.5 merge tracking manually for this branch only.