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