Merge with izpack trunk