Engine: modify user to be extension of core ::User
Merge pull request #3180 from bbuckingham/engine

Engine: modify user to be extension of core ::User