Fixed bug IZPACK-893 by integrating changes from John Mitchelland Bruno ...

...F (see https://jira.codehaus.org/browse/IZPACK-893)