Merge branch 'master' into ratjens
Merge branch 'current' into ratjens
use underscore in deriving engine name to make things more consistent for multi-word engine names
Merge pull request #121 from marketboomer/ratjens

use underscore in deriving engine name to make things more consistent for multi-word engine names