Merge branch 'MDL-51302-master' of git://github.com/danpoltawski/moodle