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