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