Experimented with Spock's @Unroll
Merge branch 'master' into jdk7