updated build tools versions
this could not possibly work
Merge branch 'master' into jdk7test