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