Merge pull request #7156 from pacien/181008-pkg-tinc