Merge branch 'MDL-56295-master' of git://github.com/andrewnicols/moodle