Tidy up imports
Update changelog

--HG--
extra : amend_source : 3acf20a8406883108601845565a206b108a4c396
Added tag 1.1.0.0 for changeset 62674a9bbc83