Fixed Java 8 syntax for retrocompatibility reasons
Merge branch 'master' into dvms2