merge changes from SVN master