This will probably become v2.1.2, so prepare the code for the release.