Shadowed:
	- Given I'll be pushing 5.0.4 versions in the next day, I'll just bump TOC now
	- Fixed macro handling (Thanks nebula169)
