issue #686
Merge branch 'csrfhook' into develop