Merge proposals

partman-basicfilesystems has no merge proposals.