Merge pull request #850 from RS71/develop

CSRF optional token regeneration