Git merges in Moodle x.x.x by Víctor Déniz Falcón

commit 93654d4b6063080d0a7144ef71d99b3814e349fd
Author: Víctor Déniz Falcón <victor@moodle.com>
Date:   Mon, 03 Sep 2018 14:00:33 +0800
Tag:    v3.4.5

Merge branch 'MDL-63255-34' of git://github.com/vmdef/moodle into MDL-63255-34-test

commit f1019f4616aee4c9e699ac82bb0d283c20d2a63e
Author: Víctor Déniz Falcón <victor@moodle.com>
Date:   Mon, 03 Sep 2018 13:56:27 +0800
Tag:    v3.5.2

Merge branch 'MDL-63255-35' of git://github.com/vmdef/moodle into MDL-63255-35-test