Git merges in Moodle 3.3.9 by Jun Pataleta

commit a5c5651a0f82a0664ece51da662ca6f73bdeb41c
Author: Jun Pataleta <jun@moodle.com>
Date:   Fri, 09 Nov 2018 11:42:11 +0800
Tag:    v3.3.9

Merge branch 'MDL-63942-33' of git://github.com/andrewnicols/moodle into MOODLE_33_STABLE


commit 7e954344d20c4f0d2cc6984394a5f14aed679281
Author: Jun Pataleta <jun@moodle.com>
Date:   Tue, 09 Oct 2018 14:39:25 +0800
Tag:    v3.3.9

Merge branch 'MDL-62491-33' of git://github.com/abgreeve/moodle into MOODLE_33_STABLE