Git merges in Moodle x.x.x by Alberto Lara Hernández

commit 4c51211800729db9a07c66715fb7d3266e3157b0
Author: Alberto Lara Hernández <alberto.lara@moodle.com>
Date:   Mon, 03 Sep 2018 18:34:14 +0800
Tag:    v3.5.2

Merge branch 'MDL-55993-35' of https://github.com/albertolarah/moodle into MDL-55993-35


commit a5ca74838f7723a559e8c58551d03e16caacfc89
Author: Alberto Lara Hernández <alberto.lara@moodle.com>
Date:   Mon, 03 Sep 2018 18:25:24 +0800
Tag:    v3.4.5

Merge branch 'MDL-55993-34' of https://github.com/albertolarah/moodle into MDL-55993-34


commit c60f5ae1364cab07cafbfa95198b28fbd721615d
Author: Alberto Lara Hernández <alberto.lara@moodle.com>
Date:   Mon, 03 Sep 2018 18:18:58 +0800
Tag:    v3.6.0-beta

Merge branch 'MDL-55993-master' of https://github.com/albertolarah/moodle into MDL-55993-master