retro-compatibilité Java 6
Merge branch 'java6or7fix' into tetrist