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