Merge branch 'MDL-51576-master-2' of git://github.com/ryanwyllie/moodle