Merge branch 'MDL-38702_master' of git://github.com/lazydaisy/moodle

diff --cc theme/mymobile/config.php
index 84bfefb,482c889..5a2fdd8
--- 1/theme/mymobile/config.php
--- 2/theme/mymobile/config.php
+++ b/theme/mymobile/config.php
@@@ -154,6 -154,16 +154,9 @@@ if ($thisdevice == "default" || $thisde
      }
  }
  
 -// Add the required JavaScript to the page
 -$THEME->javascripts = array(
 -    'jquery-1.7.1.min',
 -    'custom',
 -    'jquery.mobile-1.1.1'
 -);
 -
  // Sets a custom render factory to use with the theme, used when working with custom renderers.
  $THEME->rendererfactory = 'theme_overridden_renderer_factory';
- $THEME->csspostprocess = 'mymobile_user_settings';
+ $THEME->csspostprocess = 'mymobile_user_settings';
+ 
+ // Disables CSS Optimiser for MyMobile theme.
 -$THEME->supportscssoptimisation = false;
++$THEME->supportscssoptimisation = false;