Merge branch 'MDL-48044-master' of git://github.com/andrewnicols/moodle