Merge tag '1.5.4' into 1.6

[maven-release-plugin]  copy for tag 1.5.4
tree: 1ab525e19374cec90b749b6689cebabba1ed7d9c
  1. examples/
  2. src/
  3. .gitignore
  4. pom.xml
  5. proxy.properties
  6. README