complete merge
merged
Merge branch 'design-less' of https://github.com/brainysmurf/moodle into design-less
Merge branch 'design-less' of https://github.com/brainysmurf/moodle into design-less