Fix broken simulator build in master. Please patch next branch, too.
Merge pull request #853 from kwhatmough/master

Patch master with fix for broken simulator build. Please also patch next branch.
merge from upstream