merge squash
merge squash

fixup merge

whitespace
Merge branch 'master' of https://github.com/JeremyMarshall/gradle-jpi-plugin