merged changes from svn trunk