2.1 release on the EVIL branch