Git merges in Moodle 3.0.6 by Andrew Nicols

commit dec2a585a39ce11ddbfe5afb76a6120e003b54e3
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 16 Aug 2016 15:11:39 +0800
Tag:    v3.0.6

Merge branch 'MDL-55272-30' of https://github.com/mr-russ/moodle into MOODLE_30_STABLE

commit cf9a76e73915296c872b1908ea6e8a38a937866e
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 16 Aug 2016 08:52:56 +0800
Tag:    v3.0.6

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

commit 02d570966a76e55f48f48d9aee8cad6d7b25a272
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 11 Aug 2016 13:17:08 +0800
Tag:    v3.0.6

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

commit 95cc9d3b535bde842abcafabcdf85c32b1bd0d31
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 09 Aug 2016 14:28:19 +0800
Tag:    v3.0.6

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

commit 6c0deebbd99a7ef9afc009385917dd3de2ecfd67
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 09 Aug 2016 10:49:47 +0800
Tag:    v3.0.6

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

commit 2cfeebee65261fe3fadc2f8bad3eeb88f9370b1a
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 08 Aug 2016 10:04:18 +0800
Tag:    v3.0.6

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

commit 4c9af613278b6bbd272c616801408df711bad1d5
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 04 Aug 2016 09:58:50 +0800
Tag:    v3.0.6

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

commit 500e6d4519f34c0fdc12d4a76b8a35d7e7f33d49
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 02 Aug 2016 12:06:29 +0800
Tag:    v3.0.6

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

commit cc3126b7242c5a52e5d9caf706243e4ad655a940
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 01 Aug 2016 15:08:14 +0800
Tag:    v3.0.6

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

commit 0949754d1f7652de866ca6b7938d663c21befd71
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 13 Jul 2016 12:11:51 +0800
Tag:    v3.0.6

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