Report compiler bugs when encountered.
Report compiler bugs when hot-swapping.
Merge branch 'master' into dev
Resolve conflict
Merge branch 'dev'