Fixed compilation issues with Java 6
Merge branch 'master' into web-look-and-feel