Add back encoding.
Update dev docs
Merge branch 'master' into stable_py3