Mavenized clone of https://svn.java.net/svn/cajo~svn r2663