Git merges in Moodle 2.9.6 by David Monllao

commit 383b1ae15d186cd5ea3a6db62543ae8392b64815
Author: David Monllao <davidm@moodle.com>
Date:   Fri, 06 May 2016 16:14:57 +0800
Tag:    v2.9.6

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

commit ae77a3d6d16e7300bf4c0f51d6faaac9ef381ac1
Author: David Monllao <davidm@moodle.com>
Date:   Tue, 03 May 2016 13:03:55 +0800
Tag:    v2.9.6

Merge branch 'wip-MDL-53402-29' of git://github.com/abgreeve/moodle into MOODLE_29_STABLE

commit 809233d23fa6a05c7194db3aad22de8a67e2ee2d
Author: David Monllao <davidm@moodle.com>
Date:   Tue, 03 May 2016 09:59:18 +0800
Tag:    v2.9.6

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

commit 9b9c08cdbbe52b3ca812182afce98842228019c4
Author: David Monllao <davidm@moodle.com>
Date:   Mon, 02 May 2016 15:54:26 +0800
Tag:    v2.9.6

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

commit 4f3a6d382e0fd044b287593c9e6df3432acf4cd9
Author: David Monllao <davidm@moodle.com>
Date:   Mon, 02 May 2016 15:38:31 +0800
Tag:    v2.9.6

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

commit ded031cfc8b4f94df891bdb31a9408a2fe96d378
Author: David Monllao <davidm@moodle.com>
Date:   Mon, 02 May 2016 10:47:59 +0800
Tag:    v2.9.6

Merge branch 'MDL-53980-29-enfix' of git://github.com/mudrd8mz/moodle into MOODLE_29_STABLE

commit c3732af3f38d2e43156a856aff07794360f779ef
Author: David Monllao <davidm@moodle.com>
Date:   Thu, 28 Apr 2016 10:42:24 +0800
Tag:    v2.9.6

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

commit 8c1d988566123ba0c16ebb33f37130c2d8b7783c
Author: David Monllao <davidm@moodle.com>
Date:   Tue, 26 Apr 2016 11:12:58 +0800
Tag:    v2.9.6

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

commit af61aeda9b679b7b92dadd9bfa0261ab3ec1f51a
Author: David Monllao <davidm@moodle.com>
Date:   Wed, 20 Apr 2016 15:53:42 +0800
Tag:    v2.9.6

Merge branch 'MDL-53757_m29' of git://github.com/markn86/moodle into MOODLE_29_STABLE

commit be0f46f922a548fab7de157f4cebf98c62a6f8cd
Author: David Monllao <davidm@moodle.com>
Date:   Wed, 20 Apr 2016 11:17:07 +0800
Tag:    v2.9.6

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

commit a6d9d5f7e4367da42b6dd07c6cd3946d1441c508
Author: David Monllao <davidm@moodle.com>
Date:   Tue, 12 Apr 2016 11:31:41 +0800
Tag:    v2.9.6

Merge branch 'MDL-53007_29_STABLE' of https://github.com/marxjohnson/moodle into MOODLE_29_STABLE

commit ff51028d8d88ad11b1fce4436fc9a922365ba199
Author: David Monllao <davidm@moodle.com>
Date:   Tue, 12 Apr 2016 10:54:34 +0800
Tag:    v2.9.6

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

commit 2e40d988639437fa12576a988851275f1c4018ed
Author: David Monllao <davidm@moodle.com>
Date:   Tue, 29 Mar 2016 15:57:25 +0800
Tag:    v2.9.6

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

commit cbadf3ac6b73e2e0a606ca808a09674563146255
Author: David Monllao <davidm@moodle.com>
Date:   Tue, 29 Mar 2016 15:43:50 +0800
Tag:    v2.9.6

Merge branch 'MDL-53432-git-less-css-MOODLE_29_STABLE' of https://github.com/brendanheywood/moodle into MOODLE_29_STABLE

commit c67965f6d792f08ff488bec12d566fd218fcdbad
Author: David Monllao <davidm@moodle.com>
Date:   Tue, 29 Mar 2016 14:24:11 +0800
Tag:    v2.9.6

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

commit f61e80bd87985981723619f11595f442ce574d2b
Author: David Monllao <davidm@moodle.com>
Date:   Tue, 29 Mar 2016 12:59:03 +0800
Tag:    v2.9.6

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

commit d67e511a9ae88350aa47be03532798984df08b0d
Author: David Monllao <davidm@moodle.com>
Date:   Mon, 14 Mar 2016 14:08:55 +0800
Tag:    v2.9.6

Merge branch 'MDL-53176-29' of git://github.com/merrill-oakland/moodle into MOODLE_29_STABLE