Git merges in Moodle 3.3.3 by Dan Poltawski

commit fdf3d9bda5de62c7377c99665ecb6e20a898f1cd
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 22 Sep 2017 19:43:17 +0800
Tag:    v3.3.3

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

commit 843f487c227723a21925b90a7157d01bf283a1a4
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 19 Sep 2017 14:28:07 +0800
Tag:    v3.3.3

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

commit 766a2d3364c093f6f88aa9cc77c9ce3ebf9b3c6c
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 15 Sep 2017 15:49:28 +0800
Tag:    v3.3.3

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

commit 9da6b92faf9c4377e2cf7619b8eadea6ab073603
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 12 Sep 2017 18:24:20 +0800
Tag:    v3.3.3

Merge branch 'MDL-60039_33' of git://github.com/dmonllao/moodle into MOODLE_33_STABLE

commit bd50f5f555542818c957f7303a184f7c4abc23c6
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 12 Sep 2017 17:56:01 +0800
Tag:    v3.3.3

Merge branch 'MDL-59929_33' of git://github.com/timhunt/moodle into MOODLE_33_STABLE

commit 1298a03670b6a2f6c5b9ccae57bfc513218c78c7
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 11 Sep 2017 21:19:49 +0800
Tag:    v3.3.3

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