Merge branch 'MDL-54599-31' of git://github.com/vadimonus/moodle