do not use dict comprehension, it doesn't work in Python 2.6
update changelog
update compat level
Merge branch 'master' into debian
update changelog