Merge branch 'master' into deploy
Forgot to update variable declaration
Merge pull request #1 from Wikia/deploy

Deploy