merge from SVN master.