Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-05-03 03d03093c9ca77befa029931e089f8abac96d3bb

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

old mode 100644
new mode 100755