New snapshot version 0.21

Ready for Sprint 0.21