Merge proposals dependent on lp:~patrick-crews/drizzle/dbqp_mac_fix

lp:~patrick-crews/drizzle/dbqp_mac_fix has no merge proposals.