pom.xml changed: build options added
Merge remote-tracking branch 'origin/master'