Git merges in Moodle 3.0.4 by Andrew Nicols

commit 33647345e48e3c4ded5a7fbebe5d3f53bebebfba
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Fri, 06 May 2016 10:07:29 +0800
Tag:    v3.0.4

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

commit 6dec102c62ee965f481f5a3f037f37e375df5c8f
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 28 Apr 2016 14:16:11 +0800
Tag:    v3.0.4

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

commit a57c6830eaec04bc4e100a6d9a629acd6e73a4ce
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 19 Apr 2016 10:34:57 +0800
Tag:    v3.0.4

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

commit bfea54fdb6fe74d1807b8084f47fea5bbf8eca0c
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 07 Apr 2016 14:00:42 +0800
Tag:    v3.0.4

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

commit 42462c057ac5f60fb97ad982267194a783ba097b
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 06 Apr 2016 12:23:47 +0800
Tag:    v3.0.4

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

commit c86fca01c791021eeceda80aa04cd3a94470786d
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 06 Apr 2016 08:56:25 +0800
Tag:    v3.0.4

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

commit 6bb1094932ca3cf65c6b1e6c33fe7bb334613b15
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 05 Apr 2016 12:23:43 +0800
Tag:    v3.0.4

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

commit 144720047a3498fb7fef337e6bbc182bd8086ba6
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 04 Apr 2016 12:25:21 +0800
Tag:    v3.0.4

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

commit 38ad80c54e4980e461010db605db796c34b13362
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 16 Mar 2016 10:03:37 +0800
Tag:    v3.0.4

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

commit 2941895cda554bf6438c8e77104d3ca5db17c23c
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 15 Mar 2016 13:43:51 +0800
Tag:    v3.0.4

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

commit 222ada17262e04a1f8177900fbf0102332566c7a
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 15 Mar 2016 12:49:42 +0800
Tag:    v3.0.4

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