Fixing for Java 6.
Merge branch 'master' into realgraphics