Fix copy+paste error of SetUp so it's actually treated as SetUp
Merge branch 'develop'