Merge from Corel tree. Contributors are: