Marking this as 3.1.0 rather than 3.1-required because it should be one of the last tasks in the 3.1 project.