Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-03-30 5e981c0c36166071298a6b82cead9f81310842ab

 interface/web/admin/lib/lang/es_server_config_list.lng

old mode 100644
new mode 100755