Summary of changes: 33bebca... Update changelog (*) 0826730... fix merge (*) 552c2ad... 1.10.0 (*) (*) This commit already existed in another branch; no separate mail sent