Merge branch 'MDL-31989_admin-performance' of git://github.com/dmonllao/moodle