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