remove use of MutableMapping, not in Python 2.5
Merge branch 'master' into nine