Merge branch 'MDL-55192-master' of git://github.com/peterRd/moodle