Git merges in Moodle 3.5.4 by Adrian Greeve

commit f4b78030ae1361c3d8651b386ca96d071d1b3c85
Author: Adrian Greeve <abgreeve@gmail.com>
Date:   Thu, 20 Dec 2018 18:09:13 +0800
Tag:    v3.5.4

Merge branch 'install_35_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_35_STABLE

commit 5f2edc4df79df4da2c7005bf38bd8a1b0f0e1755
Author: Adrian Greeve <abgreeve@gmail.com>
Date:   Wed, 19 Dec 2018 19:06:05 +0800
Tag:    v3.5.4

Merge branch 'MDL-64392-35' of git://github.com/bmbrands/moodle into MOODLE_35_STABLE

commit 4632b4a151fc0353efe7af8bafbb6e62259545be
Author: Adrian Greeve <abgreeve@gmail.com>
Date:   Tue, 18 Dec 2018 23:01:48 +0800
Tag:    v3.5.4

Merge branch 'MDL-64025-35' of https://github.com/christianwolters/moodle into MOODLE_35_STABLE