Merge pull request #2374 from tru7/linknx