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

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