Merge proposals dependent on lp:~deryck/windmill/512k-bug-fix

lp:~deryck/windmill/512k-bug-fix has no merge proposals.