Version bump to 0.6.21