Merge branch 'MDL-27169_master' of git://github.com/stronk7/moodle