Targeting Java 1.8, not 1.5.
Merge branch 'development'