Merged in default (pull request #670)

2020-02-21, Gary Kramlich