Readying 2.1 release