Git merges in Moodle 3.0.4 by Eloy Lafuente (stronk7)

commit 484a08cc15cf73484a2dfde1d5cf090f5375ff18
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 20 Apr 2016 07:20:10 +0800
Tag:    v3.0.4

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

commit 1491aca61d791750e14d4e4565190396176fa1a4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Apr 2016 07:58:36 +0800
Tag:    v3.0.4

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

commit 0fd01700f4eedb490cfd2b4f278f30423dd36a79
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Apr 2016 07:46:17 +0800
Tag:    v3.0.4

Merge branch 'MDL-53795-30' of git://github.com/merrill-oakland/moodle into MOODLE_30_STABLE

commit bec533928119df3f011aceed12efd54b79d759ba
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 15 Apr 2016 16:19:17 +0800
Tag:    v3.0.4

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

commit d5344f23e494b7a8e3b39f8519dd6ace73456b98
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 06 Apr 2016 09:33:09 +0800
Tag:    v3.0.4

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

commit 1ae503de3422f0e25b93e06f91aac2bd943f9a76
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 06 Apr 2016 06:20:04 +0800
Tag:    v3.0.4

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

commit 23a605d65cbdaafa37c95b2d79513eb7c58c72e4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 06 Apr 2016 06:04:29 +0800
Tag:    v3.0.4

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

commit e0a473a0b4d0e83e41608c34a6688199767c613f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 06 Apr 2016 04:00:21 +0800
Tag:    v3.0.4

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

commit f80a695b4cf0a491f8bfdb50ce9c8c2ee09244f8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Apr 2016 01:02:53 +0800
Tag:    v3.0.4

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

commit 2f416e9f87cc8fa71905bf55d44fe7b406d0fbe8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 30 Mar 2016 06:10:59 +0800
Tag:    v3.0.4

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

commit 19e286bbe4d34d21f31339ec084f2463a4807d6d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 30 Mar 2016 05:14:21 +0800
Tag:    v3.0.4

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

commit 28e787764595a8e3749446a9db74c1ef3ff51599
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 23 Mar 2016 05:58:41 +0800
Tag:    v3.0.4

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

commit 546aae396b72dc6219b46744694679d53317381e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Mar 2016 07:14:17 +0800
Tag:    v3.0.4

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

commit 20d094cb7c1d51ec76c4f1225d3ace3a26b647d8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Mar 2016 06:07:24 +0800
Tag:    v3.0.4

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

commit a24459d3545cbe49125edf23599dc384bc8c0a2e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 17 Mar 2016 21:00:39 +0800
Tag:    v3.0.4

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

commit 158a5fe613616d4a722b969805521747a9643807
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 16 Mar 2016 07:19:02 +0800
Tag:    v3.0.4

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

commit 9e1680299acaf1e7500d655c1b1b2d91bcb856d7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 16 Mar 2016 07:05:25 +0800
Tag:    v3.0.4

Merge branch 'MDL-53430-30' of git://github.com/merrill-oakland/moodle into MOODLE_30_STABLE

commit ff1cbbe51fbac4fff0323054f223f838e82649e1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 16 Mar 2016 06:53:48 +0800
Tag:    v3.0.4

Merge branch 'mdl-53133-m30' of git://github.com/deraadt/moodle into MOODLE_30_STABLE