Merge branch 'MDL-44606-master' of http://github.com/damyon/moodle