Git merges in Moodle 3.7.0 by Damyon Wiese

commit 41c8df25832a629984aec1af626cd3c8f0dd73de
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 03 Dec 2018 15:46:40 +0800
Tag:    v3.7.0-beta

Merge branch 'MDL-64286' of https://github.com/timhunt/moodle

commit e67feef907d5d94b08013dabf482d2a7d71a1c3e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 03 Dec 2018 15:26:08 +0800
Tag:    v3.7.0-beta

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