Merge branch 'MDL-59539-master' of git://github.com/tobiasreischmann/moodle