Merged to latest svn.