Merge branch 'MDL-22308_20' of git://git.catalyst.net.nz/moodle-r2