Final commit for 3.1.1.