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