prepare for release: CHANGELOG and release instructions
bump to next patch version number
Merge branch 'master' into conflict-with-python-cookbook