Merge proposals

Peat's mirror of Coova-chilli master branch has no merge proposals.