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