Git merges in Moodle 3.6.2 by Damyon Wiese

commit 7e2f393054bd31ca6c63c055cd003945ca8cfe6e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 05 Dec 2018 12:46:51 +0800
Tag:    v3.6.2

Merge branch 'MDL-60267-master' of https://github.com/rogerbaba/moodle into MOODLE_36_STABLE