Merge branch 'MDL-31500_master-revert-ui-changes' of git://github.com/dmonllao/moodle