Merge branch 'quality_assurance' of bitbucket.org:projectswg/holocore into quality_assurance