Merge proposals dependent on lp:~keegan-csmith/ibid/jinja2-517784

lp:~keegan-csmith/ibid/jinja2-517784 has no merge proposals.