Merge remote-tracking branch 'tru7/linknx'