Merged in default (pull request #667)

2020-02-14, Gary Kramlich