Merge proposals dependent on lp://staging/~cjwatson/storm/cextensions-rename-dunder

lp://staging/~cjwatson/storm/cextensions-rename-dunder has no merge proposals.