Merge remote-tracking branch 'origin' into svn-updates