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