Host updated for fixed namespaces
Merge branch 'master' into apollo-namespace

Conflicts:
	Source/Framework/ApolloParser.cpp