this branch. While I am here, also get rid of other versionchanged:: 2.x constructs, as discussed.
Attach a file by drag & drop or click to upload
