Merge branch MDL-29187-master of git://github.com/samhemelryk/moodle