fix an analysis warning and some additional nits
Merge branch 'master' into devoncarew_nits_2
typo
Merge pull request #3390 from devoncarew/devoncarew_nits_2

fix an analysis warning and some additional nits