Git merges in Moodle 3.6.1 by Damyon Wiese

commit 60f9a401a9d8dd8ae8280c656820534a8e5b985a
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 03 Dec 2018 15:26:56 +0800
Tag:    v3.6.1

Merge branch 'MDL-64155-master' of git://github.com/vmdef/moodle into MOODLE_36_STABLE