Merge pull request #1330 from tru7/knxd