Git merges in Moodle 3.1.6 by Andrew Nicols

commit 843fcc5face5087276838ac7dabcb0f33d053489
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Fri, 05 May 2017 15:10:15 +0800
Tag:    v3.1.6

Merge branch 'wip-MDL-50670-31-fix' of https://github.com/marinaglancy/moodle into MOODLE_31_STABLE

commit 603ba08d272cdd9c1e4f026d92e21eec59889a84
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Fri, 05 May 2017 10:10:56 +0800
Tag:    v3.1.6

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

commit e7e9d4c0b5047a6c7884380d9e482404224e6e14
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 04 May 2017 11:45:55 +0800
Tag:    v3.1.6

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

commit 2786be962236608a5cfdce946f3169c7ad0f8a88
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 04 May 2017 11:03:44 +0800
Tag:    v3.1.6

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

commit a7ce01cc70f2b5c618da2c543f9a545d05cddddd
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 27 Apr 2017 11:27:23 +0800
Tag:    v3.1.6

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

commit 520a528943358d51934a438c12ca02ba378d64f3
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 18 Apr 2017 09:48:00 +0800
Tag:    v3.1.6

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

commit 7e95809a37ff6855c06aa454fb0528a7e6a4da08
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 18 Apr 2017 09:33:29 +0800
Tag:    v3.1.6

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

commit a3309be840499be822ed4e78e9e1818736b578f2
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 18 Apr 2017 09:05:53 +0800
Tag:    v3.1.6

Merge branch 'MDL-58539_31' of https://github.com/dmonllao/moodle into MOODLE_31_STABLE

commit 6df5fb575cc6c66d22f4ca13e0a630ad3e79b7f9
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 11 Apr 2017 12:22:38 +0800
Tag:    v3.1.6

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

commit c2a65ab688dc5ad29ecdde175f49ce5efd7a2b92
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 11 Apr 2017 11:35:50 +0800
Tag:    v3.1.6

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

commit f0be1f90dad07ea089b849eccbf20a809ea26a2a
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 10 Apr 2017 13:41:33 +0800
Tag:    v3.1.6

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

commit 75cb3afa71c53cf14dc70e47cfa824fce3fcd648
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 04 Apr 2017 10:56:20 +0800
Tag:    v3.1.6

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

commit 354d0f5e842af1d1189624c1fb7ded66715044e8
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 23 Mar 2017 11:54:49 +0800
Tag:    v3.1.6

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

commit 72536bd5a8a50c3885329022c387eef221e3cd57
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 20 Mar 2017 10:38:50 +0800
Tag:    v3.1.6

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

commit 0c9a5310f957f9f2a5f120a071fa57364f441b95
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 15 Mar 2017 15:15:22 +0800
Tag:    v3.1.6

Merge branch 'MDL-57658-31-integration-fix-2' of git://github.com/junpataleta/moodle into MOODLE_31_STABLE

commit aec0f344de8bc5a81eb9f0838bee26885bbe18f6
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 15 Mar 2017 11:42:58 +0800
Tag:    v3.1.6

Merge branch 'MDL-57658-31-integration-fix' of git://github.com/junpataleta/moodle into MOODLE_31_STABLE