Merge proposals dependent on lp://staging/~cjwatson/storm/py3-traceback-reference-cycles

lp://staging/~cjwatson/storm/py3-traceback-reference-cycles has no merge proposals.