closing merged branch
trac-16680
2017-09-28, Gary Kramlich