Merge proposals dependent on lp:~jelmer/brz/fix-flake8

lp:~jelmer/brz/fix-flake8 has no merge proposals.