Things needed for 2.1.0 release