Merge branch 'MDL-30700-22' of git://github.com/damyon/moodle into MOODLE_22_STABLE