Merge pull request #714 from tru7/net-linknx