Merge remote-tracking branch 'origin/master' into rawpage_tag_container

Conflicts:
	src/Blamite/Injection/TagContainerInjector.cs
Merge branch 'rawpage_tag_container' into atlas