grim/testing

grim/testing/
Merged in default (pull request #677)

2020-04-01, Gary Kramlich
4a61873ffc51