Merge branch 'patch-3' into 'stable-3.1'

Till Brehm

2016-07-01 1d87d80fb9eb9a2712e90726a89048f7c03c5995

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