Merge branch 'MDL-27125_master_2' of git://git.catalyst.net.nz/moodle-r2