Merge branch 'MDL-51719-master' of git://github.com/danpoltawski/moodle