Merge branch 'MDL-54008_master-normalise' of git://github.com/dmonllao/moodle