Merge proposals dependent on lp://staging/~deuns-martinez/loggerhead/flup

lp://staging/~deuns-martinez/loggerhead/flup has no merge proposals.