Tweak jenkins script to be less ambitious
Merge branch 'master' into dev