Merge branch 'MDL-70912-311' of git://github.com/sarjona/moodle into MOODLE_311_STABLE