Merge pull request #293 from pyr/master

Give the vm a bit more time, helps openjdk6 not failing