Merge remote-tracking branch 'trunk' into svn-merge