Merge branch 'master' of https://github.com/izpack/izpack into develop
Merge branch 'develop' of https://github.com/Murdock01/izpack