Merge proposals dependent on lp://staging/~cjwatson/storm/py3-reraise-fix

lp://staging/~cjwatson/storm/py3-reraise-fix has no merge proposals.