Merge pull request #3881 from tru7/knxd