Merge commit '467fd92fe181dab8693179e228d907ce0fd17e4e'

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