Merge branch 'MDL-27675_master' of git://github.com/grabs/moodle