changelog
increase version of master branch to 0.21dev
merge 0.20.x branch into master