Pull TagsAsClasses from @cjbell88:master