2.3
Mavenize, prepare for 2.5