Git merges in Moodle 3.3.1 by Andrew Nicols

commit 524724c6423097201837174db8813196b921facd
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 24 May 2017 14:18:58 +0800
Tag:    v3.3.1

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

commit d9c2abaa650c11deb8417a2a8e6eea95d809babd
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 23 May 2017 19:45:24 +0800
Tag:    v3.3.1

Merge branch 'MDL-58577_33-statistics-report-header-multilang' of https://github.com/lucaboesch/moodle into MOODLE_33_STABLE

commit 63752139c4998c8d75ed33b4a10657cf8db05f49
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 17 May 2017 07:00:49 +0800
Tag:    v3.3.1

Merge branch 'MDL-58795-moodle33' of https://github.com/jebarviabb/moodle into MOODLE_33_STABLE

commit fbf216799c57a67b97735b8a487a73716547ed9f
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 16 May 2017 13:52:45 +0800
Tag:    v3.3.1

Merge branch 'MDL-58756_33-statslib-roles-multilang' of https://github.com/lucaboesch/moodle into MOODLE_33_STABLE

commit 81432e74f4c284d8272f6009489a0ff4d37200c9
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 15 May 2017 15:13:04 +0800
Tag:    v3.3.1

Merge branch 'MDL-58893-33-missing-div' of https://github.com/dmitriim/moodle into MOODLE_33_STABLE