Git merges in Moodle 3.1.5 by Andrew Nicols

commit c91507f8d5b2e1c8e755a3b8cd041b5659b8bb3a
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 28 Feb 2017 10:34:09 +0800
Tag:    v3.1.5

Merge branch 'MDL-35980-31' of git://github.com/snake/moodle into MOODLE_31_STABLE

commit 12ec6228a557170175658fc5064ed69cea8b3b86
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 28 Feb 2017 09:09:54 +0800
Tag:    v3.1.5

Merge branch 'wip-MDL-55547-31' of git://github.com/marinaglancy/moodle into MOODLE_31_STABLE

commit 3b8f30b128757033cc23d0147f049af6c327abbe
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 27 Feb 2017 13:49:51 +0800
Tag:    v3.1.5

Merge branch 'MDL-50719-fast-locks-MOODLE_31_STABLE' of https://github.com/brendanheywood/moodle into MOODLE_31_STABLE

commit f76f70f1b3823f88e67901cceb3a62d5845c71b1
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 27 Feb 2017 12:21:39 +0800
Tag:    v3.1.5

Merge branch 'MDL-35980-31' of git://github.com/snake/moodle into MOODLE_31_STABLE

commit 99105dabb571ad9e25972576d935dd9d338af026
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 27 Feb 2017 11:52:24 +0800
Tag:    v3.1.5

Merge branch 'MDL-58032-31' of git://github.com/ankitagarwal/moodle into MOODLE_31_STABLE

commit 87cafedcc0151f9e6249a1a2cfe49065ff9c2ec0
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 22 Feb 2017 11:25:12 +0800
Tag:    v3.1.5

Merge branch 'MDL-56206-31' of https://github.com/snake/moodle into MOODLE_31_STABLE

commit 6df1f24a6b11e2fa18685827cbe468cdc2ff9ce6
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 31 Jan 2017 12:26:38 +0800
Tag:    v3.1.5

Merge branch 'wip-MDL-57785-31' of git://github.com/amygroshek/moodle into MOODLE_31_STABLE

commit 1f47d41b038a428f7eaa5944fc3ca3b7ab4238a4
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 31 Jan 2017 11:52:12 +0800
Tag:    v3.1.5

Merge branch 'MDL-35978-31-blockfix' of https://github.com/snake/moodle into MOODLE_31_STABLE

commit 7d2477a85901235ea8d459754378a76b9d41a50a
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 31 Jan 2017 08:55:27 +0800
Tag:    v3.1.5

Merge branch 'MDL-57296-31' of git://github.com/ankitagarwal/moodle into MOODLE_31_STABLE

commit 544a47fc077e45b64bf8c3928634a1752e4107e8
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 19 Jan 2017 12:17:50 +0800
Tag:    v3.1.5

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

commit c2a9f4669261615f5c037b7c2a70ecde5e4e3651
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 18 Jan 2017 13:10:53 +0800
Tag:    v3.1.5

Merge branch 'wip-mdl-45821-m31' of https://github.com/rajeshtaneja/moodle into MOODLE_31_STABLE