Merge pull request #362 from micmac1/kam-cve-17.01-II