java 6 compatibility
Merge branch 'develop'

* develop:
  java 6 compatibility