Merge branch 'master' of https://github.com/izpack/izpack into IZPACK-871