Support for JDK 1.8.
Merge remote-tracking branch 'origin/master'