Merge branch 'MOODLE_36_STABLE' of https://github.com/kristian-94/moodle into MOODLE_...