Merge branch '1.7'
tree: 90b1fb1f8581e5544d603fbcdd7d9fdcb7decf16
  1. src/
  2. .gitignore
  3. pom.xml