Merge pull request #2499 from tru7/knxd