Merged in dequisdequis/security/release-2.x.y (pull request #24)
release-2.x.y
2018-03-06, Gary Kramlich