Merge commit '3e9f5f3a7a36061a8e742dd4f7b85db7f7959901'

 Changes from upstream to assure Java 1.6 compliance of sub projects.
Updated version to 0.1.1-SNAPSHOT