#master: fix for jdk6