merged changes from SVN development repository