Merge branch 'master' into 'master'

Marius Burkard

2016-01-10 c2dd9c58d6d3590c519e42bb2ec8e6a56e071118

1
2
3
<tmpl_dyninclude name="content_tpl">
<input type="hidden" name="_csrf_id" value="{tmpl_var name='_csrf_id'}" />
<input type="hidden" name="_csrf_key" value="{tmpl_var name='_csrf_key'}" />