Merge branch 'MDL-63252-master' of git://github.com/lameze/moodle into master