v2.21b

see changes.txt