wip
update core
Merge branch 'master' into game
game up
merges
Merge branch 'master' into game