Fixed Bug 1024119
Merge branch 'master' of https://github.com/tanay1337/webmaker.org