Merge branch 'MDL-26562-23' of git://github.com/vadimonus/moodle