Updated core to latest from master
Updated tilemap events