Merge branch 'MDL-73915-39-terser' of https://github.com/andrewnicols/moodle into...