Changes from SVN.