merge from udhcp module
6 files changed