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