Let maven control the version
Merge origin/master