Preparing for release of 3.1.1