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