Git merges in Moodle 3.0.4 by Dan Poltawski

commit 3d9c67b089be93be44bf569a98e7a2236f3acd59
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 06 May 2016 21:08:59 +0800
Tag:    v3.0.4

Merge branch 'MDL-54042-30' of git://github.com/damyon/moodle into MOODLE_30_STABLE

commit bbeab900d679a80a94b5cff5c6e79e229750771c
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 04 May 2016 03:38:08 +0800
Tag:    v3.0.4

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

commit 4cb7ae6fa2e13e7ec80fe5df032d44fad9938b77
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 May 2016 16:13:25 +0800
Tag:    v3.0.4

Merge branch 'wip-MDL-53402-30-v2' of git://github.com/abgreeve/moodle into MOODLE_30_STABLE

commit a5df2ffa525e5b938617b5c92e5620ba5912e709
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 May 2016 16:09:13 +0800
Tag:    v3.0.4

Merge branch 'MDL-54008_30-normalise' of git://github.com/dmonllao/moodle into MOODLE_30_STABLE

commit bc22230af93450e076bfd3b2d79d8156314eeace
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 May 2016 00:06:26 +0800
Tag:    v3.0.4

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

commit 05b5af27210c77cb25a5cb9a950b6a4d070148c1
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 May 2016 23:57:12 +0800
Tag:    v3.0.4

Merge branch 'MDL-54019_m30' of git://github.com/markn86/moodle into MOODLE_30_STABLE

commit 62c8fe2d9c6d80f1b057a9e9a667f57918f366ed
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 May 2016 23:56:38 +0800
Tag:    v3.0.4

Merge branch 'wip-mdl-53861-m30' of https://github.com/rajeshtaneja/moodle into MOODLE_30_STABLE

commit c48a174fc4fbf5fc381013f31236f9c1b94071a9
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 May 2016 17:17:09 +0800
Tag:    v3.0.4

Merge branch 'wip_MDL-53033_m30' of git://github.com/gjb2048/moodle into MOODLE_30_STABLE

commit cd259077284d8c91239c45dbe3b6c4838c4ee9f5
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 May 2016 17:16:36 +0800
Tag:    v3.0.4

Merge branch 'MDL-53904-30' of git://github.com/marinaglancy/moodle into MOODLE_30_STABLE

commit 372b792a25f6af40ed7aa9e5aaa09b51d81988e0
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 May 2016 16:52:24 +0800
Tag:    v3.0.4

Merge branch 'MDL-54008_30' of git://github.com/dmonllao/moodle into MOODLE_30_STABLE

commit ac01be5ffe24bfec902c1c6b25a6106c907c4d45
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 26 Apr 2016 18:18:29 +0800
Tag:    v3.0.4

Merge branch 'MDL-53855_30' of git://github.com/timhunt/moodle into MOODLE_30_STABLE

commit 25f201c259b0857ebd36bc6a0164c7d794e946cb
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 25 Apr 2016 21:13:52 +0800
Tag:    v3.0.4

Merge branch 'MDL-49754-30' of https://github.com/xow/moodle into MOODLE_30_STABLE

commit c287b858065c9bdc1decf11deaab7d1eb3bc7516
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 20 Apr 2016 20:30:36 +0800
Tag:    v3.0.4

Merge branch 'wip-MDL-52642-30' of git://github.com/abgreeve/moodle into MOODLE_30_STABLE

commit 82c38e0c45a2445d37298a320fda7e928eda95dc
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 20 Apr 2016 18:50:01 +0800
Tag:    v3.0.4

Merge branch 'MDL-53095-30' of git://github.com/lameze/moodle into MOODLE_30_STABLE

commit e0b61ea5906a2a506552bd6187c6b45fd8979fc2
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 12 Apr 2016 23:50:29 +0800
Tag:    v3.0.4

Merge branch 'MDL-52263-30' of git://github.com/crazyserver/moodle into MOODLE_30_STABLE

commit 3fc6d79de28015cdc930c85cd1bdb179628b49f3
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 12 Apr 2016 20:18:01 +0800
Tag:    v3.0.4

Merge branch 'MDL-52944-30' of git://github.com/cameron1729/moodle into MOODLE_30_STABLE

commit 6639edc34fe1a69c0edfd8069038186d0bc5b2ec
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 11 Apr 2016 23:36:58 +0800
Tag:    v3.0.4

Merge branch 'MDL-53417-30' of git://github.com/cameron1729/moodle into MOODLE_30_STABLE

commit 56342d4eb10349a13d2a83e3fa8ba031e61f8ff8
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 11 Apr 2016 21:29:15 +0800
Tag:    v3.0.4

Merge branch 'MDL-53674-30-eventmsg' of git://github.com/mudrd8mz/moodle into MOODLE_30_STABLE

commit b512fdd040d8c3fa96ea126dd364bf03e28b2346
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 11 Apr 2016 21:10:08 +0800
Tag:    v3.0.4

Merge branch 'MDL-53728_30' of git://github.com/timhunt/moodle into MOODLE_30_STABLE

commit 12f8cb4e562ae2e18130933f3a73b99c66ec85f3
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 11 Apr 2016 20:54:31 +0800
Tag:    v3.0.4

Merge branch 'MDL-52338-30' of https://github.com/dg711/moodle into MOODLE_30_STABLE

commit f0df8853df42609b737803e989ae6b55a942a643
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 06 Apr 2016 22:48:17 +0800
Tag:    v3.0.4

Merge branch 'MDL-53000-30' of git://github.com/jleyva/moodle into MOODLE_30_STABLE

commit 5937ca9c69e54d25f5ca799dbca10261553c1e35
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 05 Apr 2016 21:34:13 +0800
Tag:    v3.0.4

Merge branch 'MDL-53000-30' of git://github.com/jleyva/moodle into MOODLE_30_STABLE

commit deb17cad7b558af67c9d7d386c5c6a37dd9073ae
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 05 Apr 2016 19:17:50 +0800
Tag:    v3.0.4

Merge branch 'MDL-53175-30' of git://github.com/jleyva/moodle into MOODLE_30_STABLE

commit 63a1a289e9ee0e0f9dceb57c35f0d558471ae849
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Apr 2016 19:10:18 +0800
Tag:    v3.0.4

Merge branch 'wip-MDL-49861-30' of git://github.com/abgreeve/moodle into MOODLE_30_STABLE

commit 5052caed58e263bd087112868da00b1609fb51d0
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Apr 2016 15:39:22 +0800
Tag:    v3.0.4

Merge branch 'm30_MDL-53622_Fix_Missing_Rewrite_Pluginfile_URLs' of https://github.com/scara/moodle into MOODLE_30_STABLE

commit bbe790a42ebf97f5fb759733d7f391ca4f1d0db5
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 31 Mar 2016 14:06:36 +0800
Tag:    v3.0.4

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

commit f256bf9169e31b95bf5284df959f7b49a479b4a7
Author: Dan Poltawski <dan@moodle.com>
Date:   Sat, 26 Mar 2016 11:37:38 +0800
Tag:    v3.0.4

Merge branch 'wip-MDL-53538-30' of git://github.com/abgreeve/moodle into MOODLE_30_STABLE

commit e068c3f0543923a8fbff4b957adb1695d982d8b8
Author: Dan Poltawski <dan@moodle.com>
Date:   Sat, 26 Mar 2016 10:36:38 +0800
Tag:    v3.0.4

Merge branch 'MDL-53562-forum-reply-re-MOODLE_30_STABLE' of https://github.com/brendanheywood/moodle into MOODLE_30_STABLE

commit 71869bc4d391c321b3bcc6ca8df720815d624fab
Author: Dan Poltawski <dan@moodle.com>
Date:   Sat, 26 Mar 2016 10:33:06 +0800
Tag:    v3.0.4

Merge branch 'MDL-53180_30' of git://github.com/stronk7/moodle into MOODLE_30_STABLE

commit f67e31c195ad59d76d0dee4b5c952ed469f0eb08
Author: Dan Poltawski <dan@moodle.com>
Date:   Sat, 26 Mar 2016 10:06:11 +0800
Tag:    v3.0.4

Merge branch 'MDL-53507_30' of git://github.com/timhunt/moodle into MOODLE_30_STABLE

commit 4840ec11938b405bf8ac3027edd927788cc4ae35
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 23 Mar 2016 12:08:22 +0800
Tag:    v3.0.4

Merge branch 'MDL-52952-30-fix' of github.com:xow/moodle into MOODLE_30_STABLE

commit f01974e9d70489954401e613bc7898ba60749831
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 23 Mar 2016 08:31:52 +0800
Tag:    v3.0.4

Merge branch 'MDL-53383-30' of git://github.com/andrewnicols/moodle into MOODLE_30_STABLE

commit 800d62c56d15b44f113852a64d888afc7e389240
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Mar 2016 10:32:36 +0800
Tag:    v3.0.4

Merge branch 'MDL-52158-30' of https://github.com/xow/moodle into MOODLE_30_STABLE

commit c52508979e79c28ccc7e16aa915180c3105beeaa
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 21 Mar 2016 14:48:43 +0800
Tag:    v3.0.4

Merge branch 'MOODLE_30_STABLE-MDL-53407-editing-css' of https://github.com/Dagefoerde/moodle into MOODLE_30_STABLE

commit 547e685ce3b297c46272c46ea87d08e9de7748be
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 21 Mar 2016 14:44:19 +0800
Tag:    v3.0.4

Merge branch 'MDL-52952-30' of https://github.com/xow/moodle into MOODLE_30_STABLE

commit a4cbeb7d0288fdff1ae7048c58ca2640c40f2bcc
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 21 Mar 2016 14:12:14 +0800
Tag:    v3.0.4

Merge branch 'MDL-53239_30' of git://github.com/dmonllao/moodle into MOODLE_30_STABLE

commit c49bb9d4250ac38970d4551bcd74912a545d4a41
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 21 Mar 2016 11:37:35 +0800
Tag:    v3.0.4

Merge branch 'MDL-53262-verp-confirm-from-support-MOODLE_30_STABLE' of https://github.com/brendanheywood/moodle into MOODLE_30_STABLE

commit daa42c3ade6bf63e3ebd3963b5a0b9127a436d29
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 21 Mar 2016 11:02:04 +0800
Tag:    v3.0.4

Merge branch 'MDL-53489_30' of git://github.com/timhunt/moodle into MOODLE_30_STABLE

commit 07054b65a8f042923372e4df41b2db68c14da248
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 21 Mar 2016 09:20:34 +0800
Tag:    v3.0.4

Merge branch 'MDL-53548-m30' of https://github.com/sammarshallou/moodle into MOODLE_30_STABLE