Merge from svn Hercules tag.
Merge from svn Hercules tag.