Merge branch 'MDL-56335-master' of git://github.com/mihailges/moodle