Merged changes from svn repository trunk.