Merge branch '1.8'
tree: 2234f763b31d9ca4c497b2f7db4bbb45f8613ac2
  1. src/
  2. .gitignore
  3. pom.xml
  4. proxy.properties