#35 Update V3-8-x branch to correctly reflect the latest svn source