Git merges in Moodle 3.6.4 by Sara Arjona

commit 6af01fb2e4c5d24146eef322d456a01eac7b3aee
Author: Sara Arjona <sara@moodle.com>
Date:   Mon, 06 May 2019 18:09:31 +0800
Tag:    v3.6.4

Merge branch 'MDL-65374-36' of https://github.com/lucaboesch/moodle into MOODLE_36_STABLE

commit 569b5eeac18a6ec05b92228445eda0db85ccc654
Author: Sara Arjona <sara@moodle.com>
Date:   Mon, 06 May 2019 16:20:07 +0800
Tag:    v3.6.4

Merge branch 'MDL-65396-36' of https://github.com/lucaboesch/moodle into MOODLE_36_STABLE

commit c487276abcf75f9050807176cd3dd744f9599b2d
Author: Sara Arjona <sara@moodle.com>
Date:   Thu, 02 May 2019 21:29:22 +0800
Tag:    v3.6.4

Merge branch 'MDL-65169-36' of https://github.com/snake/moodle into MOODLE_36_STABLE

commit d4378125252ed36fd62568ac66ef455cf4b67325
Author: Sara Arjona <sara@moodle.com>
Date:   Mon, 29 Apr 2019 14:42:44 +0800
Tag:    v3.6.4

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

commit cafb171c3a43e26a8415d5e15440ce1b0a10814d
Author: Sara Arjona <sara@moodle.com>
Date:   Fri, 26 Apr 2019 17:50:40 +0800
Tag:    v3.6.4

Merge branch 'MDL-64676-36-fix' of https://github.com/snake/moodle into MOODLE_36_STABLE

commit ea210f78e4e323d4b8731de5fc32449822abfde6
Author: Sara Arjona <sara@moodle.com>
Date:   Wed, 24 Apr 2019 15:02:35 +0800
Tag:    v3.6.4

Merge branch 'MDL-65170-36' of https://github.com/snake/moodle into MOODLE_36_STABLE

commit 4831903987b0f73e7a98cf11894987d344f29e0a
Author: Sara Arjona <sara@moodle.com>
Date:   Mon, 08 Apr 2019 20:20:41 +0800
Tag:    v3.6.4

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

commit f32bb178618201eab6395366ec4a5549544d6d12
Author: Sara Arjona <sara@moodle.com>
Date:   Mon, 08 Apr 2019 19:12:49 +0800
Tag:    v3.6.4

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

commit 2bf03fc2e0c402d0ad46c9907749cb6225d2a7cd
Author: Sara Arjona <sara@moodle.com>
Date:   Tue, 26 Mar 2019 01:20:13 +0800
Tag:    v3.6.4

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

commit 17aaad9033cbfe0ede6cf61383e886f0f0f6546d
Author: Sara Arjona <sara@moodle.com>
Date:   Mon, 25 Mar 2019 19:38:06 +0800
Tag:    v3.6.4

Merge branch 'MDL-64790-36_apidoc_fix' of https://github.com/nicoroeser/moodle into MOODLE_36_STABLE