Git merges in Moodle 3.2.5 by David Monllao

commit 9b18d1df37878f86b62c70818eeb965b88102c72
Author: David Monllao <davidm@moodle.com>
Date:   Mon, 04 Sep 2017 18:33:14 +0800
Tag:    v3.2.5

Merge branch 'MOODLE_32_STABLE-MDL-59799' of https://github.com/jojoob/moodle into MOODLE_32_STABLE

commit 3a3dab265b93acbb57f6dbf4117e2018c9c09b32
Author: David Monllao <davidm@moodle.com>
Date:   Mon, 04 Sep 2017 18:08:53 +0800
Tag:    v3.2.5

Merge branch 'wip-MDL-59815-32' of git://github.com/abgreeve/moodle into MOODLE_32_STABLE

commit d9d159e6fb8316b79c97043efe4e237daa6343f8
Author: David Monllao <davidm@moodle.com>
Date:   Mon, 04 Sep 2017 17:25:00 +0800
Tag:    v3.2.5

Merge branch 'wip-MDL-59898-32' of git://github.com/abgreeve/moodle into MOODLE_32_STABLE

commit 04bfebf961c3844341b721bf72a96ad94aebabb9
Author: David Monllao <davidm@moodle.com>
Date:   Mon, 04 Sep 2017 17:20:39 +0800
Tag:    v3.2.5

Merge branch 'MDL-59963_32-report-logs-origin-pagination' of https://github.com/lucaboesch/moodle into MOODLE_32_STABLE

commit 0783b383b93eab032177b227928ba141aafa1056
Author: David Monllao <davidm@moodle.com>
Date:   Mon, 07 Aug 2017 20:41:53 +0800
Tag:    v3.2.5

Merge branch 'MDL-59642-32' of git://github.com/andrewnicols/moodle into MOODLE_32_STABLE

commit 74cf6f09d0e0e1f37956c27e4369e6ef204c756f
Author: David Monllao <davidm@moodle.com>
Date:   Mon, 07 Aug 2017 15:22:07 +0800
Tag:    v3.2.5

Merge branch 'wip-MDL-59055-32' of git://github.com/marinaglancy/moodle into MOODLE_32_STABLE

commit 8e7d737d393f62871ea9c7d484c1aebaf12eaae4
Author: David Monllao <davidm@moodle.com>
Date:   Tue, 01 Aug 2017 15:23:01 +0800
Tag:    v3.2.5

Merge branch 'wip-MDL-53492-32' of git://github.com/marinaglancy/moodle into MOODLE_32_STABLE

commit 99c6170e396941aef14b10e77b558a166a2c7040
Author: David Monllao <davidm@moodle.com>
Date:   Mon, 31 Jul 2017 23:15:14 +0800
Tag:    v3.2.5

Merge branch 'wip-MDL-59496-32-3' of git://github.com/marinaglancy/moodle into MOODLE_32_STABLE

commit bcc09bcf6454b8834785f19fb81e443a11f65dad
Author: David Monllao <davidm@moodle.com>
Date:   Mon, 31 Jul 2017 20:47:35 +0800
Tag:    v3.2.5

Merge branch 'wip-MDL-59311-32' of git://github.com/marinaglancy/moodle into MOODLE_32_STABLE

commit f97f4c2e8cb98ab42cb02896d20521c2935b8a1c
Author: David Monllao <davidm@moodle.com>
Date:   Mon, 31 Jul 2017 20:20:14 +0800
Tag:    v3.2.5

Merge branch 'MDL-59535-32' of git://github.com/lameze/moodle into MOODLE_32_STABLE

commit 629dbe65bf017f56f594d78fe45a482dfffb4f18
Author: David Monllao <davidm@moodle.com>
Date:   Mon, 31 Jul 2017 20:10:12 +0800
Tag:    v3.2.5

Merge branch 'MDL-57546-32' of git://github.com/andrewnicols/moodle into MOODLE_32_STABLE

commit 683241a7b1dca82aca0ecb5dd52ced6d95c8b439
Author: David Monllao <davidm@moodle.com>
Date:   Mon, 31 Jul 2017 14:36:56 +0800
Tag:    v3.2.5

Merge branch 'MDL-58744-32' of https://github.com/jacac/moodle into MOODLE_32_STABLE

commit 7dfe16bf7206e0029b8a6257d3e8b6f57a8ecb46
Author: David Monllao <davidm@moodle.com>
Date:   Tue, 25 Jul 2017 17:11:23 +0800
Tag:    v3.2.5

Merge branch 'MDL-59485-32' of https://github.com/IMSGlobal/moodle into MOODLE_32_STABLE

commit 6832876b6336fa1798ee151f020bbc24411ef6a3
Author: David Monllao <david.monllao@gmail.com>
Date:   Mon, 24 Jul 2017 19:04:04 +0800
Tag:    v3.2.5

Merge branch 'MDL-59509-32' of git://github.com/andrewnicols/moodle into MOODLE_32_STABLE

commit 849895e2ad8c7526764b245f46780095fc843cea
Author: David Monllao <david.monllao@gmail.com>
Date:   Tue, 18 Jul 2017 16:49:33 +0800
Tag:    v3.2.5

Merge branch 'wip-MDL-39471-32' of git://github.com/abgreeve/moodle into MOODLE_32_STABLE

commit 7ea1012da8bd922ff81f5bbee3b28c03b7725944
Author: David Monllao <david.monllao@gmail.com>
Date:   Tue, 18 Jul 2017 15:40:36 +0800
Tag:    v3.2.5

Merge branch 'MDL-57991-m32' of https://github.com/micaherne/moodle into MOODLE_32_STABLE

commit 1eabeab91cf32fc128160739da13ff8a806f024a
Author: David Monllao <david.monllao@gmail.com>
Date:   Tue, 18 Jul 2017 15:08:58 +0800
Tag:    v3.2.5

Merge branch 'wip-MDL-58362-32' of git://github.com/marinaglancy/moodle into MOODLE_32_STABLE

commit 6f90ebe723e0c8ea0083258a058428e13323d404
Author: David Monllao <david.monllao@gmail.com>
Date:   Mon, 17 Jul 2017 21:48:28 +0800
Tag:    v3.2.5

Merge branch 'wip-MDL-59411-32' of git://github.com/marinaglancy/moodle into MOODLE_32_STABLE

commit a1fbd178054c49a15830735686760e344b791c91
Author: David Monllao <david.monllao@gmail.com>
Date:   Mon, 17 Jul 2017 20:08:36 +0800
Tag:    v3.2.5

Merge branch 'MDL-59527-32' of git://github.com/damyon/moodle into MOODLE_32_STABLE

commit a419a8c997f26ea0629008375e88dda7fc96a002
Author: David Monllao <david.monllao@gmail.com>
Date:   Mon, 17 Jul 2017 17:05:42 +0800
Tag:    v3.2.5

Merge branch 'wip-MDL-59377-32-3' of git://github.com/marinaglancy/moodle into MOODLE_32_STABLE

commit 5ed5e269c35ac0262718668d313f195349363819
Author: David Monllao <david.monllao@gmail.com>
Date:   Mon, 17 Jul 2017 16:10:09 +0800
Tag:    v3.2.5

Merge branch 'MDL-59068-32' of git://github.com/dpalou/moodle into MOODLE_32_STABLE

commit 0e314c3d576811327c7eb0129e3afcb99ec40fc7
Author: David Monllao <david.monllao@gmail.com>
Date:   Mon, 17 Jul 2017 15:32:20 +0800
Tag:    v3.2.5

Merge branch 'MDL-54607-32' of git://github.com/ankitagarwal/moodle into MOODLE_32_STABLE

commit e788c61ef158371a488dd48b92c93e5892f918e3
Author: David Monllao <david.monllao@gmail.com>
Date:   Mon, 17 Jul 2017 15:09:16 +0800
Tag:    v3.2.5

Merge branch 'wip-MDL-55912-32' of git://github.com/abgreeve/moodle into MOODLE_32_STABLE

commit bb245a5462bfeb18d58426d9e3fb4c166e2191d2
Author: David Monllao <david.monllao@gmail.com>
Date:   Tue, 11 Jul 2017 18:37:26 +0800
Tag:    v3.2.5

Merge branch 'wip-MDL-59363-32' of git://github.com/marinaglancy/moodle into MOODLE_32_STABLE

commit 8a1518fe544ba6f7f2076d1f7bbbd2f3e519e241
Author: David Monllao <david.monllao@gmail.com>
Date:   Tue, 11 Jul 2017 18:05:53 +0800
Tag:    v3.2.5

Merge branch 'MDL-59431_32' of git://github.com/timhunt/moodle into MOODLE_32_STABLE

commit 625ec8107efd2b00c51593dbb59c4bedcbe08e11
Author: David Monllao <david.monllao@gmail.com>
Date:   Tue, 11 Jul 2017 17:41:24 +0800
Tag:    v3.2.5

Merge branch 'wip-MDL-59441-32' of git://github.com/marinaglancy/moodle into MOODLE_32_STABLE

commit e635e8d6fd6942b8f96be1e101b627e6c5cce4b6
Author: David Monllao <david.monllao@gmail.com>
Date:   Mon, 10 Jul 2017 20:39:07 +0800
Tag:    v3.2.5

Merge branch 'MDL-52501-m32' of https://github.com/NeillM/moodle into MOODLE_32_STABLE

commit baf675f11136f2e992524366a6850388246e8af9
Author: David Monllao <david.monllao@gmail.com>
Date:   Mon, 10 Jul 2017 20:22:22 +0800
Tag:    v3.2.5

Merge branch 'MDL-58332-32' of git://github.com/ryanwyllie/moodle into MOODLE_32_STABLE