Git merges in Moodle 3.6.2 by Eloy Lafuente (stronk7)

commit 5f85b353055edddaa4b6adabd8f884bb1094550d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 10 Jan 2019 06:36:57 +0800
Tag:    v3.6.2

Merge branch 'MDL-64479_36' of https://github.com/timhunt/moodle into MOODLE_36_STABLE

commit 3dd8792045a1aad1dc912cf0a40c0639acee475c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 09 Jan 2019 19:36:33 +0800
Tag:    v3.6.2

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

commit b60fa84aadf7be1572c1ce153f1d615801569c9f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 09 Jan 2019 07:03:13 +0800
Tag:    v3.6.2

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

commit d21c67114ff2ee8490105a28fe4e26ff13e8766c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 08 Jan 2019 23:18:31 +0800
Tag:    v3.6.2

Merge branch 'MDL-64509-36-enfix' of git://github.com/mudrd8mz/moodle into MOODLE_36_STABLE

commit 90fc88b56d01adf6cd47203a059f01d3b6243308
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 08 Jan 2019 05:13:00 +0800
Tag:    v3.6.2

Merge branch 'MDL-63809-36-5' of git://github.com/rezaies/moodle into MOODLE_36_STABLE