Synced with master?

I hope I did it right this time... Clownacy:AS reports that it isn't behind master by any number of commits, while MapMacros still does, so it seems like I got it working, at least as far as Clownacy:AS is concerned. It's just a simple merge, so the changes are the same as in master.

Bit perfect (by AS standards), conflicts were handled, the build process goes without error.