Merge pull request #30120 from nico202/master
ntk: 2017-04-22 -> 1.3.1000
authored by Jörg Thalheim and committed by GitHub 8 years ago 2a4affd5 c25eb2d3