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