Storm

Merge proposals dependent on lp://staging/~cjwatson/storm/tox-fix-cextensions-logic

  1. tox-fix-cextensions-logic
  2. Dependent merge proposals

lp://staging/~cjwatson/storm/tox-fix-cextensions-logic has no merge proposals.