Merge branch '1.7'
tree: 731e163baddc5e2d8d40a8a83eec7707e29cbab8
  1. src/
  2. .gitignore
  3. pom.xml