Merged in feature/gplugin-query-cleanups (pull request #79)
develop
2020-04-19, Gary Kramlich