Split in two masters for java6 and java7
Fixes #8