Merged in bugfix/pvs-studio-g-set-error-fix (pull request #34)
develop
2019-09-30, Gary Kramlich