Merge branch 'stable-3.1'

Marius Burkard

2016-03-02 59f3ca6201c1487f3a4aceafe2c4a96201e58ce7

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'}" />