Reset after Razor problems
Merge branch 'develop' into HEAD