Merged in default (pull request #652)

2020-04-09, Gary Kramlich