Git merges in Moodle 3.6.1 by Jun Pataleta

commit 1b972c31aceeba73da7d00be5d9e671906dbba50
Author: Jun Pataleta <jun@moodle.com>
Date:   Tue, 04 Dec 2018 12:03:08 +0800
Tag:    v3.6.1

Merge branch 'MDL-64307_36' of git://github.com/markn86/moodle into MOODLE_36_STABLE

commit 79abbd9adccf8e58f741dbe535db7b6871214c49
Author: Jun Pataleta <jun@moodle.com>
Date:   Tue, 04 Dec 2018 11:13:37 +0800
Tag:    v3.6.1

Merge branch 'MDL-64206_36' of git://github.com/markn86/moodle into MOODLE_36_STABLE