Merge proposals dependent on lp:~andrebachmann-dd/qbzr/revert-fix-no_files

lp:~andrebachmann-dd/qbzr/revert-fix-no_files has no merge proposals.