Update to latest version of codehaus
Merge branch 'origin/codehaus'