Working on CSRF protection
Reverting change
Merge branch 'master' into develop