Final changes for 3.1.0.