More Maven testing.
Merge branch 'mvn-test' into develop