Git merges in Moodle 3.6.2 by Sara Arjona

commit 8f6ba8afc425837f6c6aa6ebed4532259e7d4f08
Author: Sara Arjona <sara@moodle.com>
Date:   Fri, 11 Jan 2019 00:51:30 +0800
Tag:    v3.6.2

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


commit 85558782838790aaf05e1a207058d6755c7c72aa
Author: Sara Arjona <sara@moodle.com>
Date:   Mon, 07 Jan 2019 21:18:23 +0800
Tag:    v3.6.2

Merge branch 'MDL-64419-36' of git://github.com/bmbrands/moodle into MOODLE_36_STABLE