Backport of coova-chilli