Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-01-30 f686264ad6d82cfaf4e401da2e259880f57bfade

 interface/web/sites/form/database.tform.php

@@ -90,7 +90,7 @@
         'formtype' => 'SELECT',
         'default' => 'mysql',
         'value'  => array(
            'mongo' => 'MongoDB',
            /*'mongo' => 'MongoDB',*/
            'mysql' => 'MySQL'
         )
      ),