merged changes from the official SVN repository