Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-02-18 324bfbde30d632bcd19009dbca1cb68cb160fbc1

 server/mods-available/monitor_core_module.inc.php

@@ -41,7 +41,6 @@

   function process() {
   }

}

?>