Merge branch 'master' into 'stable-3.1'

Till Brehm

2016-07-11 8e7f89749f427c3ba3fe0929fe3d536acc485302

1
2
3
4
5
# Format: usertype:url_path:field
# usertype can be: any/client/admin
# Example:
# admin:/admin/language_edit.php:POST.records.weak_password_txt
admin:/admin/language_edit.php:POST.records