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