Merge proposals dependent on lp:~cjwatson/storm/py3-raise

lp:~cjwatson/storm/py3-raise has no merge proposals.