Changes necessary for team city to build
Merge branch 'master' of https://github.com/gizmohd/vixen