Merge branch 'wip-MDL-29188-master' of git://github.com/samhemelryk/moodle