Git merges in Moodle 3.3.1 by David Monllao

commit f786e59224d5912ef1b9ba85b403647f01c7f658
Author: David Monllao <david.monllao@gmail.com>
Date:   Tue, 27 Jun 2017 23:47:00 +0800
Tag:    v3.3.1

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


commit 61812e3dd8d9785753cf6f47a983bee7292bf9f8
Author: David Monllao <david.monllao@gmail.com>
Date:   Tue, 27 Jun 2017 22:42:33 +0800
Tag:    v3.3.1

Merge branch 'wip-MDL-59308-33' of git://github.com/marinaglancy/moodle into MOODLE_33_STABLE


commit eaeed5b281ced994c28697d2b8b4a83aab90aa02
Author: David Monllao <david.monllao@gmail.com>
Date:   Tue, 27 Jun 2017 22:39:56 +0800
Tag:    v3.3.1

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


commit d259cafd3cccfb7f3344566ced66933f2123e606
Author: David Monllao <david.monllao@gmail.com>
Date:   Tue, 27 Jun 2017 21:55:33 +0800
Tag:    v3.3.1

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


commit f96167c02e48bae20239a8ce37d4796c9dd3d259
Author: David Monllao <davidm@moodle.com>
Date:   Mon, 22 May 2017 15:14:09 +0800
Tag:    v3.3.1

Merge branch 'MOODLE_33_STABLE_MDL-56973' of https://github.com/fwsl/moodle into MOODLE_33_STABLE