Git merges in Moodle 2.9.6 by Andrew Nicols

commit b53f8c676c3f89114823e45fe2ae143c5dbde39e
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Fri, 06 May 2016 10:14:48 +0800
Tag:    v2.9.6

Merge branch 'wip-mdl-53701-m29' of https://github.com/rajeshtaneja/moodle into MOODLE_29_STABLE

commit 9909401af4a522d09a5abcd9fe48730dcf0e4743
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 28 Apr 2016 14:16:57 +0800
Tag:    v2.9.6

Merge branch 'MDL-53858_29' of git://github.com/timhunt/moodle into MOODLE_29_STABLE

commit 35720ce43b391a105853ee6493a4c4513f2a2851
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 19 Apr 2016 10:37:04 +0800
Tag:    v2.9.6

Merge branch 'MDL-53779-29' of git://github.com/FMCorz/moodle into MOODLE_29_STABLE

commit d414753678ab28661d3b43183d241e1fad3d3e5a
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 07 Apr 2016 14:00:33 +0800
Tag:    v2.9.6

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

commit ff0cc2dc3ccca7be6328cadb0e4a82c2bbc350bd
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 06 Apr 2016 12:24:58 +0800
Tag:    v2.9.6

Merge branch 'wip-mdl-53381-m29' of https://github.com/rajeshtaneja/moodle into MOODLE_29_STABLE

commit 1b46b00f9844e678491a74b65b73328032c47b2f
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 06 Apr 2016 08:57:04 +0800
Tag:    v2.9.6

Merge branch 'MDL-53461-29' of git://github.com/crazyserver/moodle into MOODLE_29_STABLE

commit ef19640b64011b65b67547c17a6a15a4ad5f907e
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 05 Apr 2016 12:28:50 +0800
Tag:    v2.9.6

Merge branch 'MDL-53500-29' of git://github.com/cameron1729/moodle into MOODLE_29_STABLE

commit a39a67a4369a7d52152dda7a2471a59e8f4207dc
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 04 Apr 2016 12:26:21 +0800
Tag:    v2.9.6

Merge branch 'MDL-53661_29' of https://github.com/sam-moodle/moodle into MOODLE_29_STABLE

commit c0ed242820d312a849c922c0ab5d504734e77277
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 16 Mar 2016 10:04:10 +0800
Tag:    v2.9.6

Merge branch 'MDL-51828-29' of git://github.com/FMCorz/moodle into MOODLE_29_STABLE

commit 3648a75ef1e05191eb0c6fa212505c852f812509
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 15 Mar 2016 13:44:10 +0800
Tag:    v2.9.6

Merge branch 'MDL-53234-support-email-MOODLE_29_STABLE' of https://github.com/brendanheywood/moodle into MOODLE_29_STABLE

commit 627cfe2398967772722045bc79cd260dac55359c
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 15 Mar 2016 12:50:00 +0800
Tag:    v2.9.6

Merge branch 'MDL-53351-29-lti-notice' of git://github.com/mudrd8mz/moodle into MOODLE_29_STABLE