Merge branch 'MDL-56952-master' of git://github.com/damyon/moodle

lib/classes/plugininfo/theme.php

@@ -34,7 +34,7 @@ class theme extends base {
     public function is_uninstall_allowed() {
         global $CFG;
 
-        if ($this->name === 'base' or $this->name === 'bootstrapbase') {
+        if ($this->name === 'bootstrapbase') {
             // All of these are protected for now.
             return false;
         }