Merge branch 'MDL-61012_master' of https://github.com/troywilliams/moodle