Git merges in Moodle 3.1.6 by Dan Poltawski

commit 0dcab26cd9391ac28457593c09f8713634a8646f
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 04 May 2017 22:15:06 +0800
Tag:    v3.1.6

Merge branch 'MDL-58709-31' of git://github.com/jleyva/moodle into MOODLE_31_STABLE

commit 08ff55dad7355cece2f8b65d7f201f10d63b8c39
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 03 May 2017 23:50:33 +0800
Tag:    v3.1.6

Merge branch 'MDL-58772_31' of git://github.com/aolley/moodle into MOODLE_31_STABLE

commit 5c93b9a5ce6f5f56c3667eb73f85d8670ed8c8db
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 03 May 2017 21:13:22 +0800
Tag:    v3.1.6

Merge branch 'MDL-35913-31' of git://github.com/jleyva/moodle into MOODLE_31_STABLE

commit 4f14f2f49164dc82780063553b6eaf0723e7fa94
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 03 May 2017 21:03:11 +0800
Tag:    v3.1.6

Merge branch 'MDL-58434-31' of git://github.com/jleyva/moodle into MOODLE_31_STABLE

commit 1769ede1429054ce6d73f42f9ecfb72eb94e4642
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 28 Apr 2017 19:35:49 +0800
Tag:    v3.1.6

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

commit e411b59f80395b29cd9bdd5cb59bf7e22c9635a9
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 28 Apr 2017 14:50:29 +0800
Tag:    v3.1.6

Merge branch 'MDL-58722-31-fix' of https://github.com/xow/moodle into MOODLE_31_STABLE

commit c06dc5766674813acf40784a6d81d9f1dde63186
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 28 Apr 2017 01:35:30 +0800
Tag:    v3.1.6

Merge branch 'wip-MDL-58689-31' of git://github.com/marinaglancy/moodle into MOODLE_31_STABLE

commit d39fbc3e064f6e8e3ae14c0ddf46dc2ac165d070
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 27 Apr 2017 21:36:25 +0800
Tag:    v3.1.6

Merge branch 'MDL-58722-31' of git://github.com/damyon/moodle into MOODLE_31_STABLE

commit 6cbdb4c31c534d5c0bb635a55aa571d0b2225eac
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 24 Apr 2017 18:05:19 +0800
Tag:    v3.1.6

Merge branch 'MDL-58556-31' of git://github.com/damyon/moodle into MOODLE_31_STABLE

commit 3b9df47dfe849c2f2331e9414530c7744015e2c1
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 21 Apr 2017 22:47:32 +0800
Tag:    v3.1.6

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

commit c6fa627a231f4abff424ee29ab5c46cf74eb5729
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 19 Apr 2017 01:54:02 +0800
Tag:    v3.1.6

Merge branch 'MDL-58463-31' of git://github.com/junpataleta/moodle into MOODLE_31_STABLE

commit df2b12bf1b3a09db7266544e0ec7f1fd23caa43c
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 18 Apr 2017 23:49:05 +0800
Tag:    v3.1.6

Merge branch 'MDL-58374-31-ltierrorlog' of git://github.com/mudrd8mz/moodle into MOODLE_31_STABLE

commit c075a898e19008c5c8fba60ce75fb55a459b1adf
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 18 Apr 2017 19:34:03 +0800
Tag:    v3.1.6

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

commit 89e5f43109c284e09b55728900117b5ede3451bd
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Apr 2017 19:17:53 +0800
Tag:    v3.1.6

Merge branch 'MDL-58486_31' of git://github.com/timhunt/moodle into MOODLE_31_STABLE

commit f6ae580fbb8f00ecfec4241aff1978354a43405c
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Apr 2017 17:46:09 +0800
Tag:    v3.1.6

Merge branch 'MDL-58479-31-weblib-notice-phpdoc' of git://github.com/roperto/moodle into MOODLE_31_STABLE

commit d8928b45355887309155e11045fa8dffaf1b9faa
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Apr 2017 17:41:19 +0800
Tag:    v3.1.6

Merge branch 'MDL-58465-31' of git://github.com/ankitagarwal/moodle into MOODLE_31_STABLE

commit 23ba40cf63f3fc22a46684d43398e530346455dd
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Apr 2017 17:30:39 +0800
Tag:    v3.1.6

Merge branch 'MDL-58393-31_filter-order' of https://github.com/roperto/moodle into MOODLE_31_STABLE

commit 09d71211469aa2a7279dd9389969ce1ec891e234
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Apr 2017 17:03:25 +0800
Tag:    v3.1.6

Merge branch 'MDL-58593-31' of git://github.com/merrill-oakland/moodle into MOODLE_31_STABLE

commit 47abeb18f61ff90a98fc260ab01a1a40bf4711cb
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 13 Apr 2017 22:57:27 +0800
Tag:    v3.1.6

Merge branch 'MDL-32596_31' of https://github.com/rezaies/moodle into MOODLE_31_STABLE

commit c7806282a80ec3f05d65a6a0e66383c192cd5407
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 31 Mar 2017 16:16:34 +0800
Tag:    v3.1.6

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

commit 1a1cc84af1d8b0092fc17b824d9f689b32b13e83
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 29 Mar 2017 01:02:44 +0800
Tag:    v3.1.6

Merge branch 'MDL-58264_31' of https://github.com/darrencocco/moodle into MOODLE_31_STABLE

commit ac5f2bc552fc05f158874ed7c81d0c1a360cbd47
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 28 Mar 2017 23:00:25 +0800
Tag:    v3.1.6

Merge branch 'MDL-58227-31' of git://github.com/jleyva/moodle into MOODLE_31_STABLE

commit f569989db30809e624009b2641447c686df48642
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 28 Mar 2017 19:07:30 +0800
Tag:    v3.1.6

Merge branch 'MOODLE_31_STABLE' of https://github.com/fwsl/moodle into MOODLE_31_STABLE

commit af84c619a09de5705f186390db32f615697d1f51
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 28 Mar 2017 18:34:41 +0800
Tag:    v3.1.6

Merge branch 'MDL-58160_31' of git://github.com/aolley/moodle into MOODLE_31_STABLE

commit ce51586b24076137c982d2be4887a22ab326998e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 28 Mar 2017 17:56:01 +0800
Tag:    v3.1.6

Merge branch 'wip-MDL-58092-31' of git://github.com/marinaglancy/moodle into MOODLE_31_STABLE

commit b9866e9e7188e80c30ba45a109f630dcc2a7aea6
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 28 Mar 2017 17:51:01 +0800
Tag:    v3.1.6

Merge branch 'MDL-58257_M31' of https://github.com/ak4t0sh/moodle into MOODLE_31_STABLE

commit 00a142859b765b6013b2a8aa95096f45466bf040
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 21 Mar 2017 15:58:00 +0800
Tag:    v3.1.6

Merge branch 'MDL-58317-31' of git://github.com/damyon/moodle into MOODLE_31_STABLE

commit 258db34bfc0898ddc196a521b9607f362892cc0d
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 Mar 2017 19:09:41 +0800
Tag:    v3.1.6

Merge branch 'MDL-58273-31-ldapenrol' of git://github.com/mudrd8mz/moodle into MOODLE_31_STABLE

commit be12bb8ab8ef18969ecaaeecdd3fdce64b813000
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 Mar 2017 16:54:11 +0800
Tag:    v3.1.6

Merge branch 'MDL-58285-m31' of https://github.com/NeillM/moodle into MOODLE_31_STABLE

commit 71a3196ddff2da7a1045cc01f174d68a971d9c51
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 16 Mar 2017 19:52:52 +0800
Tag:    v3.1.6

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

commit 3a9570a37ad6853f14970356cce92d013f54ca0d
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 15 Mar 2017 00:11:36 +0800
Tag:    v3.1.6

Merge branch 'MDL-57658-31-3' of git://github.com/junpataleta/moodle into MOODLE_31_STABLE