Changes necessary to build for 2.11.0-RC1.