Merge branch '1.7' into 1.8
tree: 78ee102a32a72186e30b292808d3e626d9606225
  1. src/
  2. .gitignore
  3. pom.xml