Protect against CSRFs properly
Merge branch 'develop'