Bump to 0.6.21