Merge pull request #4968 from marcin1j/pr/20171018-nbd-bump-to-3.16.2