misc fixes
Merge branch 'master' into devoncarew_misc_fixes2
fix
Merge pull request #2221 from devoncarew/devoncarew_misc_fixes2

Devoncarew misc fixes2