Merge Omnigon's changes.