Merge branch 'MDL-58634-master' of git://github.com/bmbrands/moodle