updated CHANGELOG [ci skip]
Merge branch 'master' into 1.1