Git merges in Moodle 3.3.0 by Dan Poltawski

commit f0cba09e16e9e2ff4b3e1bb3314c7cb702deb77d
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 12 May 2017 17:02:40 +0800
Tag:    v3.3.0-rc3

Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

commit 4f3962e4b4c0634adb5d8769ad9a6c267d65e6f2
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 12 May 2017 15:19:07 +0800
Tag:    v3.3.0-rc3

Merge branch 'MDL-58904-master-fix' of https://github.com/snake/moodle

commit a1c6871bb390c68bb44c7375bfd01df43fc3430c
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 11 May 2017 21:26:33 +0800
Tag:    v3.3.0-rc3

Merge branch 'wip-MDL-58837-master' of git://github.com/marinaglancy/moodle

commit e838654b4ea37de217d096d5fdb56c6abe06e5e4
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 10 May 2017 19:01:08 +0800
Tag:    v3.3.0-rc3

Merge branch 'MDL-58877-master-enfix' of git://github.com/mudrd8mz/moodle

commit ef1a227e38e4091ea28ba0639339a6a1118da85b
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 10 May 2017 18:16:19 +0800
Tag:    v3.3.0-rc3

Merge branch 'wip-MDL-58867-master' of git://github.com/marinaglancy/moodle

commit fd8d1648a700767924c934f1c8414bbfb06d7868
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 10 May 2017 13:56:42 +0800
Tag:    v3.3.0-rc3

Merge branch 'MDL-58836-master' of git://github.com/damyon/moodle

commit ac1a8f7de10105417abfa47de7d9ac948f1d7721
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 09 May 2017 19:42:19 +0800
Tag:    v3.3.0-rc2

Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

commit cd501e12c6197bff57da8f3be30c7b7b1eba4f19
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 09 May 2017 16:17:47 +0800
Tag:    v3.3.0-rc2

Merge branch 'MDL-58853' of git://github.com/stronk7/moodle

commit 1595500ffeec73c341b1513c365d07afa89b699e
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 08 May 2017 21:46:26 +0800
Tag:    v3.3.0-rc2

Merge branch 'MDL-58793-master-authcfgskip' of git://github.com/mudrd8mz/moodle

commit 5da6b0f18be6a71ebad280d6e3968b285555fabf
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 08 May 2017 19:06:32 +0800
Tag:    v3.3.0-rc2

Merge branch 'wip-MDL-58784-master' of git://github.com/marinaglancy/moodle

commit 69015dd0524f67e8d43f7aceec987ed433d27041
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 08 May 2017 17:44:04 +0800
Tag:    v3.3.0-rc2

Merge branch 'MDL-58414-master' of git://github.com/damyon/moodle

commit e18cd34bbbfd207117b8b36082765a319059d739
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 08 May 2017 17:31:59 +0800
Tag:    v3.3.0-rc2

Merge branch 'MDL-58765-master' of git://github.com/damyon/moodle

commit 3cc5abc16304c8ba5f944e4482755081584bdfaa
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 08 May 2017 17:31:37 +0800
Tag:    v3.3.0-rc2

Merge branch 'wip-MDL-58688-master-c' of git://github.com/marinaglancy/moodle

commit 97b93cafef21545f281b134ec2b6bb17e9452cf9
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 04 May 2017 22:15:35 +0800
Tag:    v3.3.0-rc1

Merge branch 'MDL-58725_master' of git://github.com/markn86/moodle

commit ad587bee83d851153db96d0ac60c1c0489f63f9f
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 04 May 2017 22:13:05 +0800
Tag:    v3.3.0-rc1

Merge branch 'MDL-58709-master' of git://github.com/jleyva/moodle

commit bf39e7c7aaa51b9c914c6f4985e49ef244e99d61
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 04 May 2017 17:00:37 +0800
Tag:    v3.3.0-rc1

Merge branch 'MDL-58800-master' of git://github.com/damyon/moodle

commit c201e4df405c8951de118440914e0520a0fe4851
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 03 May 2017 23:50:29 +0800
Tag:    v3.3.0-rc1

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

commit 9a5f5ed56bcce7131395594e4489d341efd05d88
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 03 May 2017 21:15:11 +0800
Tag:    v3.3.0-rc1

Merge branch 'MDL-35913-master' of git://github.com/jleyva/moodle

commit a724a97f25a054e6b1fd43d3b65fe0d92af5281d
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 03 May 2017 21:01:59 +0800
Tag:    v3.3.0-rc1

Merge branch 'MDL-58434-master' of git://github.com/jleyva/moodle

commit a1646c18695be7b337ad95ad9594508f85b8fb88
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 03 May 2017 20:30:43 +0800
Tag:    v3.3.0-rc1

Merge branch 'MDL-50670_master' of git://github.com/markn86/moodle

commit 93c253d30313cbe21c1d4dc328008ec54451bd30
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 03 May 2017 20:19:19 +0800
Tag:    v3.3.0-rc1

Merge branch 'MDL-58794-master' of git://github.com/junpataleta/moodle

commit be7c4e4cac89f41fa45075882d7042b7e73232c7
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 03 May 2017 19:17:13 +0800
Tag:    v3.3.0-rc1

Merge branch 'MDL-58798-master' of git://github.com/junpataleta/moodle

commit 2e04d927186076e1bedb5e91eb6318d6074c385c
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 03 May 2017 18:17:45 +0800
Tag:    v3.3.0-rc1

Merge branch 'MDL-58692-master-authcfgnames' of git://github.com/mudrd8mz/moodle

commit b2a57a53f8c00af95ff80cba4aaccc8bbca6f3f0
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 03 May 2017 17:39:51 +0800
Tag:    v3.3.0-rc1

Merge branch 'wip-MDL-58661-master' of git://github.com/marinaglancy/moodle

commit f0572ad21f38071f02f4c9ecdfc15f342802d877
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 01 May 2017 18:25:39 +0800
Tag:    v3.3.0-rc1

Merge branch 'MDL-58760-master-pixescape' of git://github.com/mudrd8mz/moodle

commit 0fa1c5a100f21710c20bbdf033816bfdad2a07b2
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 28 Apr 2017 19:36:27 +0800
Tag:    v3.3.0-rc1

Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

commit 712a9b648195a4f97d02416cad2d437917b237b4
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 28 Apr 2017 16:44:35 +0800
Tag:    v3.3.0-rc1

Merge branch 'MDL-58643-master' of git://github.com/snake/moodle

commit baf3d04954a5c464dfa0803eddabf0e848a00e45
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 28 Apr 2017 01:35:28 +0800
Tag:    v3.3.0-rc1

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

commit e6dd8f32f58bd87a0b8584108b11318af187f718
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 28 Apr 2017 00:02:12 +0800
Tag:    v3.3.0-rc1

Merge branch 'wip-MDL-58671-double-escaping-in-course-overview' of https://github.com/marcusgreen/moodle

commit 3ee1817ea09d559480b936ff1e9551f6a4ff3314
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 27 Apr 2017 21:36:23 +0800
Tag:    v3.3.0-rc1

Merge branch 'MDL-58722-master' of git://github.com/damyon/moodle

commit 371482f881270874d3d85c5c232640d1b15c7d0c
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 24 Apr 2017 18:05:09 +0800
Tag:    v3.3.0-rc1

Merge branch 'MDL-58556-master' of git://github.com/damyon/moodle

commit 427327e9bee4584bcb2322bec04f639fe6fbc0cf
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 21 Apr 2017 22:48:27 +0800
Tag:    v3.3.0-beta

Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

commit 97182da01ab1a2f6abb66240a19bb89007337b30
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 21 Apr 2017 22:37:51 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-58138-master-bulkcompletefix' of https://github.com/mudrd8mz/moodle

commit 79420165f018f5f61e9c8bdd486e9680dcd0da21
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 21 Apr 2017 16:04:43 +0800
Tag:    v3.3.0-beta

Merge branch 'wip-MDL-58138-fix2' of https://github.com/marinaglancy/moodle

commit 992b2962095d7d83512ebf688953659fbbc722b0
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 20 Apr 2017 20:14:00 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-58621-master' of git://github.com/ryanwyllie/moodle

commit 1d53b80c449bb0b971b6c741be4e1799bdf53e1d
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 20 Apr 2017 17:33:53 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-58426-master-bigicons' of git://github.com/mudrd8mz/moodle

commit 8afd1e2bd66a8bede1af68100e2aced8314144bc
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 20 Apr 2017 15:26:54 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-58538-master' of git://github.com/junpataleta/moodle

commit cdfcfb1f8cf30d1f2807f74fe4d89d3bf8d91f68
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 20 Apr 2017 14:44:56 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-58498-master' of git://github.com/ryanwyllie/moodle

commit fd91fe42caac2cd6346e7d38fe67d73e5dc9e81a
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 20 Apr 2017 14:27:56 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-58637_master' of git://github.com/markn86/moodle

commit 13e58982bbf8585a4fa0d19a0fc8e96e0982106b
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 20 Apr 2017 14:19:17 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-58617-master' of git://github.com/lameze/moodle

commit 9c1889810a3ea0bdc34eaa73b2c248b1061ab1da
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 19 Apr 2017 02:48:35 +0800
Tag:    v3.3.0-beta

Merge branch 'wip-MDL-58502-master' of git://github.com/marinaglancy/moodle

commit 385e2fc839e268ab0e0e25af0a0c72a6f06c3871
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 19 Apr 2017 02:47:04 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-58526_m33v2' of https://github.com/sbourget/moodle

commit c4642d14a7a0bb8c8c27078b712d6e5a342563f3
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 19 Apr 2017 01:53:51 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-58463-master' of git://github.com/junpataleta/moodle

commit 10422a55450b3826bb07b7dc8cc278c68799e51d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 18 Apr 2017 23:54:33 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-58629' of git://github.com/stronk7/moodle

commit 6bf6a54b75d5aa3e313c406fe308625e97c57eae
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 18 Apr 2017 23:47:31 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-58618-master' of https://github.com/xow/moodle

commit c7b7d67295f0751bc23fd5570cca7ef57dc4ebfd
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 18 Apr 2017 23:46:12 +0800
Tag:    v3.3.0-beta

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

commit 06fcba4bd93687d543888be10b5cd95664ddf893
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 18 Apr 2017 23:45:09 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-58603-master' of git://github.com/ankitagarwal/moodle

commit 114bcbe0ba4a1475bf33c566327b5368d0a4f480
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 18 Apr 2017 19:34:49 +0800
Tag:    v3.3.0-beta

Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

commit 38a941990edbfbfa5c79f7221ddf0a20ea8692f4
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 18 Apr 2017 16:03:58 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-58464-int-fix-2' of git://github.com/ryanwyllie/moodle

commit 0680dcac83d997ea2018df6326e3350ec329cef0
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 18 Apr 2017 15:15:57 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-58464-int-fix-1' of git://github.com/ryanwyllie/moodle

commit 48411a8843d53c869964bc71d2fa0bc77736c39b
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Apr 2017 19:15:40 +0800
Tag:    v3.3.0-beta

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

commit ae86b0879a7a725ea75aa1d8884ea4724544d67b
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Apr 2017 18:23:52 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-58499-master' of git://github.com/barbararamiro/moodle

commit 2d48a763f5d98db10712da5e8dc347a9b8084c2b
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Apr 2017 18:07:43 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-58549-master' of https://github.com/xow/moodle

commit e526e43269c8c1a3f031dcc1c127f1cbe64006e5
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Apr 2017 17:59:47 +0800
Tag:    v3.3.0-beta

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

commit 9556d5ec521e2d87ddb8b004133bfeee61e6cff8
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Apr 2017 17:53:42 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-46929' of https://github.com/stronk7/moodle

commit 6a346ab44014f1a8e6599affc8d24eb2ca6fdd66
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Apr 2017 17:42:48 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-58507_master' of git://github.com/markn86/moodle

commit a9d3bf7666214d602d7164281697fefcfb6fdb53
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Apr 2017 17:41:16 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-58465-master' of git://github.com/ankitagarwal/moodle

commit 0bb4ee0fe36c7f434c760f9a9aedf982d1e19008
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Apr 2017 17:30:32 +0800
Tag:    v3.3.0-beta

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

commit 6e45cfc0c00c903ed67439158d927568f5d4a18d
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Apr 2017 17:03:07 +0800
Tag:    v3.3.0-beta

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

commit 0c290ad191a8c0bcfbf5a012d97998840395fc80
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 13 Apr 2017 22:58:00 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-32596_master' of https://github.com/rezaies/moodle

commit ca7de06cf308f5b45e614b70b5228fc05358a5e4
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 13 Apr 2017 22:33:43 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-58085-master' of git://github.com/cameron1729/moodle

commit b634c3266851c8053bd8515577d8c922525201c4
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 06 Apr 2017 17:51:37 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-12689_master-fix' of git://github.com/dmonllao/moodle

commit b6deaa14b633cf7a23db68bde9d31e9a03d1d013
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 06 Apr 2017 15:56:51 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-55611-master-behat-fix' of git://github.com/lameze/moodle

commit 5f5f71ea6214b059325eebf3ae0630baa369b454
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 05 Apr 2017 19:44:03 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57411-master' of git://github.com/jleyva/moodle

commit c3345f32f0821c53cd01b57a8a13e1afc7e69acc
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 05 Apr 2017 17:16:57 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-58220-master-fix3' of http://github.com/damyon/moodle

commit 1e4e5c52d79c95f07ea65828fd272f8e3cb5e0be
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 05 Apr 2017 00:07:41 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-55611-master' of git://github.com/danpoltawski/moodle

commit 5eff54929d357838b326ce1d5da0219636260e16
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Apr 2017 14:51:05 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-12689-master-fix1' of http://github.com/damyon/moodle

commit ab8aa882141162c472b7bdbd42b3982e11373c59
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Apr 2017 13:56:26 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-55941-initialbar-ux' of https://github.com/ilya-catalyst/moodle

commit dda4dcaffbd3eed2679339eb16326a7038d99e0f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Apr 2017 13:54:07 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-58220-master-fix1' of http://github.com/damyon/moodle

commit a29cd3138cae2cf1c080836880aa8ba5911cfb6a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Apr 2017 00:59:34 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57411-master' of git://github.com/jleyva/moodle

commit 3ca68f24f7ee4c39d01e41cd3ab051bd9920501d
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 03 Apr 2017 19:41:56 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-58220-master' of git://github.com/damyon/moodle

commit 02eaa42f238c2ba359219c2e73667fe2768e1ce5
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 03 Apr 2017 16:13:55 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-37765-MASTER' of https://github.com/jacac/moodle

commit 0e4530f0fde32412d608583cf309b058a47464ae
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 31 Mar 2017 16:16:24 +0800
Tag:    v3.3.0-beta

Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

commit acfab4cc7b33e5d910df5c292ec9a9459a9be0a5
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 31 Mar 2017 16:12:16 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-58450_master' of git://github.com/dmonllao/moodle

commit f98ad251aeb4f47f2b38a686948cfadbe575bcae
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 29 Mar 2017 01:33:19 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-55139' of git://github.com/stronk7/moodle

commit a1355e53e8a366707572758ad7c16b88169adac4
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 29 Mar 2017 01:02:40 +0800
Tag:    v3.3.0-beta

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

commit 54e9302b5f390fd9c193a75c8cb9b4d51a8ed073
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 28 Mar 2017 23:02:07 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-58227-master' of git://github.com/jleyva/moodle

commit 6ba920575f8cf7cae72632f240f5a188d859d53a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 28 Mar 2017 19:07:29 +0800
Tag:    v3.3.0-beta

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

commit 702be5ee4753fee888bffd7d6f7bb7f19d75fb58
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 28 Mar 2017 18:34:33 +0800
Tag:    v3.3.0-beta

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

commit c7c96ddc7cc799a77e1db780ffc43a58a4427b79
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 28 Mar 2017 17:56:00 +0800
Tag:    v3.3.0-beta

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

commit 313aa6161094c1a7937c93fc13a45d7acbb45f7f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 28 Mar 2017 17:50:57 +0800
Tag:    v3.3.0-beta

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

commit ed8ab587befdf9629a02a6657563e045f3abc2f6
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 28 Mar 2017 17:15:22 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-38278-pptx-et-al-presentation-group' of https://github.com/lucaboesch/moodle

commit a6c34f3298e2a269af59b32998c059e015a795ee
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 27 Mar 2017 16:41:27 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57510-master' of git://github.com/ankitagarwal/moodle

commit d959810fcf5c7d90b674f035a359b0727ea8ac14
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 22 Mar 2017 16:52:57 +0800
Tag:    v3.3.0-beta

Merge branch 'wip-MDL-34859-fix' of https://github.com/marinaglancy/moodle

commit 0c5eee372bd25c0a6b89ed28cbbb8bed5d1bbee6
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 21 Mar 2017 19:38:06 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57162-master' of git://github.com/jleyva/moodle

commit 5fd24a89a65c3d5c6711d8e29be537cbf814fa0a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 21 Mar 2017 19:28:13 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-56324-master' of https://github.com/lucisgit/moodle

commit dca0ea03b1a4f3a465c2ba0e947ca1bff1429d86
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 21 Mar 2017 16:03:42 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-58317-master' of git://github.com/damyon/moodle

commit 7bb2eafe9ce0a955f39c22ae388973e9ee1d5118
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 Mar 2017 23:19:55 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-58262-master' of git://github.com/merrill-oakland/moodle

commit 230216803c5786452036706c3e79d9c57bf44bff
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 Mar 2017 21:51:30 +0800
Tag:    v3.3.0-beta

Merge branch 'wip-mdl-58261-m' of https://github.com/rajeshtaneja/moodle

commit 83a6b8c48c728bca61bb9e5023584b776efeaace
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 Mar 2017 21:19:22 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-58050-master-msgtrans' of git://github.com/mudrd8mz/moodle

commit 57ee1502fd127ac77198051b0842c94d40c8eacb
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 Mar 2017 21:15:07 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-58121-master' of https://github.com/snake/moodle

commit 7d77fb1421b9a7596e13e35a4267f7833333efad
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 Mar 2017 21:08:54 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-58255-master' of git://github.com/junpataleta/moodle

commit d4d91727bf4996b81726df0f78e27dd8ab65f163
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 Mar 2017 19:39:58 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-58263-master' of git://github.com/jleyva/moodle

commit 5de6c5dc3bf986604255ebfe3ca818a0032d4ade
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 Mar 2017 19:27:04 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57838-master' of git://github.com/jleyva/moodle

commit d9b094a31db4c79e0947b07315fbac2e8446f574
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 Mar 2017 19:09:33 +0800
Tag:    v3.3.0-beta

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

commit e8f859424481954b80ef7ea05b56d49028d65e50
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 Mar 2017 16:53:23 +0800
Tag:    v3.3.0-beta

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

commit 11e7eb3088d2a51c364b552952738bb74e6dd9eb
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 Mar 2017 16:49:54 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-58291-master-unoconvlink' of git://github.com/mudrd8mz/moodle

commit 48f5c0501904e8eb7e0444c2e4381bfad9129971
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 Mar 2017 15:54:22 +0800
Tag:    v3.3.0-beta

Merge branch 'wip-MDL-34859-master' of git://github.com/marinaglancy/moodle

commit 5d8d3a8ce22aa5526feb7f40528817ec4de54799
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 Mar 2017 15:24:54 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57657-master' of git://github.com/jleyva/moodle

commit 1ea1180a6f01729c0b656b7d2524a9782831dc90
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 17 Mar 2017 16:21:03 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57648-master' of git://github.com/jleyva/moodle

commit aed2641a8b71824bdad9887ef1d85f22ab4e75f5
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 16 Mar 2017 23:42:07 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57645-master' of git://github.com/jleyva/moodle

commit ec673f6f98b76285e7aca03e15b280e452ba533e
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 16 Mar 2017 19:52:44 +0800
Tag:    v3.3.0-beta

Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

commit 943055c72daf0772555c98b0a6a01f882c1707a0
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 15 Mar 2017 16:12:04 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57631_master-disable-cli' of git://github.com/dmonllao/moodle

commit edf102805ae0743c8459dea3c2076267821ba367
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 15 Mar 2017 00:31:05 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-58023_behat_find_node_in_navigation_improvement_master' of https://github.com/gthomas2/moodle

commit bcd510e36dbc2fe8babe55087337dd0934c3c847
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 15 Mar 2017 00:06:19 +0800
Tag:    v3.3.0-beta

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

commit 732bd1317194fa0a7550fabfcb993d4afab93c14
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 14 Mar 2017 20:07:33 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-55528-master' of git://github.com/andrewnicols/moodle

commit 1a22d8d57218cc3926fdf3275e839c7abe641806
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 14 Mar 2017 17:07:17 +0800
Tag:    v3.3.0-beta

Merge branch 'wip-mdl-58169' of https://github.com/rajeshtaneja/moodle

commit 1523d53bdc4886faca70225cb238474ba6e6e205
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 08 Mar 2017 01:49:42 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-58035' of git://github.com/timhunt/moodle

commit 228637feffeb4e05dff927214a07a6ca92f08f8f
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 08 Mar 2017 01:00:07 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57990-master' of git://github.com/crazyserver/moodle

commit 6dba6a5a6a85cfcc741febd5df1dd9c2fe8ffd14
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 07 Mar 2017 22:12:32 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57999_2' of https://github.com/zoebogner/moodle

commit 7ebe17f38a727e340355695bb84cba99c31b1cca
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 07 Mar 2017 22:08:24 +0800
Tag:    v3.3.0-beta

Merge branch 'wip-mdl-58056' of https://github.com/rajeshtaneja/moodle

commit 58798ecb524eb9fa97171bc7c165a21379832164
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 07 Mar 2017 22:07:47 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57361-master' of git://github.com/jleyva/moodle

commit a3da85e42efe410c84610b99ace70bbf7a5ce72e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 07 Mar 2017 18:43:46 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-58040' of git://github.com/timhunt/moodle

commit 44c4f148daeb6619b865cd6e24eeb014deb7be3c
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 07 Mar 2017 18:02:33 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-55859-master' of git://github.com/ankitagarwal/moodle

commit 473efd8d53b7c900a85d97ecd5df9e0263721244
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 07 Mar 2017 17:54:37 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-58052_behat_get_session_user' of https://github.com/gthomas2/moodle

commit d04310cb218156cfac20f6dd67263d4e74e011c0
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 07 Mar 2017 17:47:38 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57362-master' of git://github.com/ankitagarwal/moodle

commit 99ad8199d80987afadd5c4a6176f7db1cfa4292b
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 07 Mar 2017 00:51:07 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57932-core-moodle-logo-svg' of https://github.com/lucaboesch/moodle

commit 8b9196d7d2b8ae45a047661f5ee9923a0c89e48c
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 07 Mar 2017 00:43:38 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57887-nginx-username-logging' of https://github.com/brendanheywood/moodle

commit 892ceeb74ec96494dfd52e050f81d00e1f86b4d5
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 06 Mar 2017 21:27:10 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57362-master' of git://github.com/ankitagarwal/moodle

commit f1b1c85b63cd165761fb6a8c221a65a707a56ca5
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 Feb 2017 19:19:16 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57962-master' of git://github.com/dpalou/moodle

commit c7abec68a6c4b9c8ba69c60d5edea520ced76edb
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 Feb 2017 03:44:51 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57967_master' of git://github.com/markn86/moodle

commit 3129b28a285b70cae4de4f8f26bcd441efbe210a
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 16 Feb 2017 16:14:28 +0800
Tag:    v3.3.0-beta

Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

commit 1fff8332cf4aeafa1f20d4fe379c31d178676aeb
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 16 Feb 2017 15:51:02 +0800
Tag:    v3.3.0-beta

Merge branch 'wip-MDL-4782-fix' of https://github.com/marinaglancy/moodle

commit c3998beb3fb712546edbee0f3c063022cc944a99
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 14 Feb 2017 19:20:37 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57810-nginx-buffers' of https://github.com/brendanheywood/moodle

commit 898f227f406c0068b40dd04df78ca7d8ec8888c6
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 14 Feb 2017 18:34:39 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-46375-master' of git://github.com/andrewnicols/moodle

commit 518f42f5f9c5fa3e96b603e58d5b312ac6a2db3a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 14 Feb 2017 16:40:07 +0800
Tag:    v3.3.0-beta

Merge branch 'wip-mdl-55476' of https://github.com/rajeshtaneja/moodle

commit cb0081661024324001166684acd0b0c8473b9248
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 14 Feb 2017 00:22:34 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-56841' of https://github.com/andrewhancox/moodle

commit 69723d002b05b817310e1f4a923384c8ad49413c
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 13 Feb 2017 21:53:10 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57752_tracksessionip' of git://github.com/davosmith/moodle

commit f5af2e6866074c27833909e3d6cbd859a3174b08
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 13 Feb 2017 21:41:13 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-55476-master' of git://github.com/jadet23/moodle

commit b747a90082ed774d1176db830eb361a34c13ae25
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 13 Feb 2017 21:28:37 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57768-webservice-config-error' of https://github.com/ilya-catalyst/moodle

commit a06677a3b57407a67641ff121dd1cd7aaa1dbf97
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 08 Feb 2017 17:14:07 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57370-master-int-fix-1' of git://github.com/ryanwyllie/moodle

commit cf8c463de6286a7de90fefbd36bc2d0434bf305e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 07 Feb 2017 20:32:34 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57009-master' of git://github.com/damyon/moodle

commit 125fa38af30d60330dabe5feea7917383f8d40b2
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 07 Feb 2017 18:35:13 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57370-master' of git://github.com/ryanwyllie/moodle

commit 808d652e812b90ac2f738b584a2c67ceb64b2572
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 06 Feb 2017 21:46:50 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57660-master' of git://github.com/junpataleta/moodle

commit 586543f2dc25a577d7d27b8a5f710ccf6328b511
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 06 Feb 2017 18:59:26 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57587' of git://github.com/timhunt/moodle

commit 326efc7c66f1d06c2512b01256ba227a54056e69
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 31 Jan 2017 19:39:05 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57588' of git://github.com/timhunt/moodle

commit 8cf4591a8e38723016d4fd05734fcce917d0e887
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 31 Jan 2017 19:35:39 +0800
Tag:    v3.3.0-beta

Merge branch 'wip-mdl-54628' of https://github.com/rajeshtaneja/moodle

commit ac08d4556a04ab2ad79a3080771e5e4432016572
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 31 Jan 2017 17:32:53 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57300-master' of git://github.com/ankitagarwal/moodle

commit 7a6b7f0b752eec06375144860e35091cfb1d5aaf
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 31 Jan 2017 16:33:53 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57586-master' of https://github.com/nashtechdev01/moodle

commit f17eb367711a32274830aefba1a0d202e8be41f9
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 31 Jan 2017 16:28:15 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57728_m33v1' of https://github.com/sbourget/moodle

commit 010e22169b4577dc72efe9bb8f9357c5b1f16d5a
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 30 Jan 2017 18:08:26 +0800
Tag:    v3.3.0-beta

Merge branch 'wip-MDL-57782-master' of git://github.com/marinaglancy/moodle

commit b040b5234027bd0e166c248fe7857807156ccf60
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 30 Jan 2017 17:54:13 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-35978-master' of https://github.com/snake/moodle

commit 9e3df32f5c4292e44d62ed35f46af6ea40cc7c6e
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 30 Jan 2017 17:34:27 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-36233-master' of git://github.com/lameze/moodle

commit 9f43d5052a294da7cad2d338d70992031aea7d24
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 24 Jan 2017 18:11:30 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57639-master' of git://github.com/andrewnicols/moodle

commit 948aec4a09fd47287428cc8e9a506a7ca1877089
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 24 Jan 2017 17:38:14 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57667-master' of https://github.com/snake/moodle

commit 8120cbd939700165ff47ba3813b82f692db9317e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 24 Jan 2017 17:15:59 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-50539-master' of git://github.com/jleyva/moodle

commit 48034807eed1e767783770e7712fb82d7e00f5c5
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 24 Jan 2017 17:15:50 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-50545-master' of git://github.com/jleyva/moodle

commit 79b717ec04820e9fea4a7955f75b32db0e5959df
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 24 Jan 2017 17:01:59 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-56449_assign_groups' of git://github.com/davosmith/moodle

commit cffa0ec79b3757854325ec0454c6f1100d11448a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 24 Jan 2017 00:21:02 +0800
Tag:    v3.3.0-beta

Merge branch 'wip_master_mdl-50625_ldap_better_check_paged_results_support' of https://github.com/iarenaza/moodle

commit 4bd0a8a64adfafd666fb240a929ef0ac216bfda8
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 23 Jan 2017 23:39:55 +0800
Tag:    v3.3.0-beta

Merge branch 'wip-MDL-57511-master' of git://github.com/Beedell/moodle

commit e3ee9d48844563db41ff6a4fc12222b481c917f4
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 23 Jan 2017 20:24:10 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57415_m33v1' of https://github.com/sbourget/moodle

commit 1342a1c60518394f266db264ecae3510daa0b7bf
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 23 Jan 2017 20:19:22 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57287-master' of git://github.com/snake/moodle

commit d602810fd547bcae9fecd871416d5b07d4f97fba
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 23 Jan 2017 20:05:32 +0800
Tag:    v3.3.0-beta

Merge branch 'mdl57668-master' of https://github.com/tlock/moodle

commit 81b3aefc3107afecf3d0ed2d70583751c0215384
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 23 Jan 2017 19:59:11 +0800
Tag:    v3.3.0-beta

Merge branch 'wip-mdl-57700' of https://github.com/rajeshtaneja/moodle

commit ee2af37e843645b45dee02b8754bded0b82bb296
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 23 Jan 2017 17:48:11 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57677-master-usermodified' of git://github.com/mudrd8mz/moodle

commit c7f9bbf6c17968f68992f175e76de76712cce2ed
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 23 Jan 2017 17:28:32 +0800
Tag:    v3.3.0-beta

Merge branch 'master_MDL-46782' of git://github.com/danmarsden/moodle

commit c44913b845a235a1b48477c761ef268d56a3bab4
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 23 Jan 2017 17:26:57 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57737-master' of git://github.com/crazyserver/moodle

commit 419b2f1741740951e85348a486c8c306e1330b01
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 17 Jan 2017 18:28:31 +0800
Tag:    v3.3.0-beta

Merge branch 'wip-mdl-57669-m' of https://github.com/rajeshtaneja/moodle

commit bb72d31944464b8b0166c07cbd13e268b1369ab4
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 17 Jan 2017 18:20:08 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57515-master' of https://github.com/sammarshallou/moodle

commit 5bd052f8092cb57e06f722ec45053577129b70ea
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 17 Jan 2017 15:32:38 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-50542-master' of git://github.com/jleyva/moodle

commit fb0d86f6717f1a4852308202cd233c823d08f5fd
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 17 Jan 2017 14:52:07 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-50549-master' of git://github.com/jleyva/moodle

commit cd0e2e89f2f6eee920fb9c1b7d6b7dc5fac95596
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 17 Jan 2017 00:20:05 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57368-master-2' of https://github.com/snake/moodle

commit afcb080014468ecdf52c3e5b50657c2c28947075
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 17 Jan 2017 00:17:09 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57613-master' of https://github.com/xow/moodle

commit 7043676ec35a8f620f87d274a25523543f74a9d3
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 16 Jan 2017 21:34:06 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57452_behat_completion_fix_master' of https://github.com/gthomas2/moodle

commit 75cb891b5a78826a69792a0f44a2f24a5fdb6749
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 16 Jan 2017 20:23:55 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57601-master' of https://github.com/sammarshallou/moodle

commit 42d80f2b9de29df9fe9ad8b736b9fd311e9d6a91
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 16 Jan 2017 20:10:44 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57374_master' of https://github.com/dasistwas/moodle

commit a04ad3675aa4ac39582e6b087ad323600fea002d
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 16 Jan 2017 19:17:58 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57554-master' of git://github.com/crazyserver/moodle

commit 41dd0ac8d4613bb5e1d8c2cbda7d23a7e044e888
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 16 Jan 2017 16:57:52 +0800
Tag:    v3.3.0-beta

Merge branch 'master_MDL-45821' of git://github.com/danmarsden/moodle

commit 0893bb0897f13adafd4d321d2c5496a1dbb3156b
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 16 Jan 2017 16:22:25 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57627-master' of git://github.com/crazyserver/moodle

commit bd17f93f2814ecd8f249dbe4b255cd6502e58cc3
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 16 Jan 2017 16:01:23 +0800
Tag:    v3.3.0-beta

Merge branch 'wip-MDL-56271-master' of git://github.com/marinaglancy/moodle

commit 25d66117882a29543b2304eec30b9f9cb44746f5
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 12 Jan 2017 15:42:24 +0800
Tag:    v3.3.0-beta

Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

commit 38425d9fee3dd097cd9f7f4857cb5c3f567649df
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 10 Jan 2017 16:40:10 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57480-master' of https://github.com/snake/moodle

commit feb75612a70e0cdfe7c37bbba8963f12f1af835a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 10 Jan 2017 00:25:15 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57427' of https://github.com/jrchamp/moodle

commit 1975dcf25c86b63f4b2f23562afda0a8ae441d29
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 09 Jan 2017 18:51:23 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-55461_atto_equation' of git://github.com/davosmith/moodle

commit fc893bc42d44cd6b36801b089d7bbc0bf8e1309c
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 09 Jan 2017 18:23:11 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-40132_31' of https://github.com/IvannavISer/moodle

commit 66677b710297d7e72a4a0edd3bf8d3dd90f1a62b
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 09 Jan 2017 17:58:57 +0800
Tag:    v3.3.0-beta

Merge branch 'wip-mdl-56211' of https://github.com/rajeshtaneja/moodle

commit 5445df29578540d82fca9862d43e2684796a1e5d
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 09 Jan 2017 17:42:27 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57373-master' of git://github.com/ankitagarwal/moodle

commit 3b2c5923f29439c6a48234e16a311f5257ea75e9
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 09 Jan 2017 16:27:18 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-53367_master' of https://github.com/juancs/moodle

commit 70d8808476c3bd7c24404d847b5013ea5469c540
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 06 Jan 2017 09:30:48 +0800
Tag:    v3.3.0-beta

Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

commit 7716be5ae84eb8ad96927d2f573a55c6f52b388f
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 05 Jan 2017 18:09:17 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57563-master-enfix' of git://github.com/mudrd8mz/moodle

commit e0d1efd896e097d84331a5586e66be52e223cc63
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 05 Jan 2017 14:51:54 +0800
Tag:    v3.3.0-beta

Merge branch 'wip-mdl-57531' of https://github.com/rajeshtaneja/moodle

commit b6f5e57e450452fbecb59d4b50c054f3b1d50186
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 04 Jan 2017 21:29:10 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57531-master-phpmailer' of git://github.com/mudrd8mz/moodle

commit c3e9e8bc3c6bf4d249dbc2a63af26705d5b2c0b1
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 04 Jan 2017 02:07:12 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57389-master' of git://github.com/jleyva/moodle

commit 2c814d2c5efa540035aa537b1e83d49c922268a9
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Jan 2017 16:16:22 +0800
Tag:    v3.3.0-beta

Merge branch 'wip-mdl-52168' of https://github.com/rajeshtaneja/moodle

commit 00e741af48b8e5430bca1c123c395bd4d611c572
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Jan 2017 20:35:11 +0800
Tag:    v3.3.0-beta

Merge branch 'master_MDL-49557' of git://github.com/danmarsden/moodle

commit 241473ce2eaa731f1b922d1def2a4d73125a85d3
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Jan 2017 20:20:34 +0800
Tag:    v3.3.0-beta

Merge branch 'master_MDL-52168' of git://github.com/danmarsden/moodle

commit 589449b81eec516a92249e3a437317a827d51379
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Jan 2017 20:15:01 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57080-m' of https://github.com/micaherne/moodle

commit 6dbe17545429a0739d7b084643775c9b88055c4b
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Jan 2017 19:46:44 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57395-master' of git://github.com/jleyva/moodle

commit 25a222734ed7e56e4b9de5c600975c3a81616798
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Jan 2017 19:16:27 +0800
Tag:    v3.3.0-beta

Merge branch 'wip-MDL-57464-master' of git://github.com/abgreeve/moodle

commit 77e1c18727775af556dde8a514c04cbc7e066b1c
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Jan 2017 18:34:58 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57532_m33v1' of https://github.com/sbourget/moodle

commit 4053aa77fa911c794124926598944d87c0bf8acc
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 29 Dec 2016 19:50:50 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57512-master' of git://github.com/crazyserver/moodle

commit 5d970e1aa025914597e2d18913cd5f054cf5d03c
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 29 Dec 2016 19:46:47 +0800
Tag:    v3.3.0-beta

Merge branch 'master_MDL-50643' of git://github.com/danmarsden/moodle

commit a92fc9b45e5b84ae066c0ce5cd21a008dc6f1654
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 28 Dec 2016 23:20:04 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57451-master' of https://github.com/lucisgit/moodle

commit 398e8fa1edcda2d878ced91d403c1a7568e90de7
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 28 Dec 2016 23:11:56 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-55955_master' of git://github.com/markn86/moodle

commit 16cfeccad839ee131f2ff7431bae3b8afe6a7155
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 28 Dec 2016 23:06:03 +0800
Tag:    v3.3.0-beta

Merge branch 'wip-MDL-57366-master' of git://github.com/abgreeve/moodle

commit 79be02bf8d5f65e88f3f40bd019e944baca0a6fd
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 28 Dec 2016 20:17:15 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57417-master' of https://github.com/snake/moodle

commit 66b68d631d0e233b51054ff6a780ccf173b1f9be
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 28 Dec 2016 18:30:51 +0800
Tag:    v3.3.0-beta

Merge branch 'wip-MDL-57251-master' of git://github.com/abgreeve/moodle

commit 83c7b312cd94e26616e641d8218d3ab1bbddce8f
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 28 Dec 2016 17:13:29 +0800
Tag:    v3.3.0-beta

Merge branch 'wip-MDL-57292-master' of git://github.com/abgreeve/moodle

commit 20ad9c7b4e318e1485ab3d6a2a03ceaa9cfd57a6
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 28 Dec 2016 16:56:12 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57474-master-messageid' of git://github.com/mudrd8mz/moodle

commit 3a4eba7aa0bcd1b113266a2d56570370e0fe465f
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 22 Dec 2016 16:15:02 +0800
Tag:    v3.3.0-beta

Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

commit 988a031a610bab3c271e9ea4a9e1f4ce038c4550
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Dec 2016 17:19:23 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-54996_m33v1' of https://github.com/sbourget/moodle

commit caf52b578b69809751c37e7bbde10e9c09db35ec
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 19 Dec 2016 23:46:54 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57386-master' of git://github.com/damyon/moodle

commit 7d64e2c3bc0b0ec58368d6c339375713bb2bb0db
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 19 Dec 2016 22:33:05 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-55568_m33v2' of https://github.com/sbourget/moodle

commit 64e032b6dae3c2a9d95b7e27a44ae8c177a6aebc
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 19 Dec 2016 20:21:06 +0800
Tag:    v3.3.0-beta

Merge branch 'wip-MDL-56912-master' of git://github.com/marinaglancy/moodle

commit dc87f411dd957c0a6573d5ce73f8ef783867a61f
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 19 Dec 2016 19:25:47 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-52098_master' of git://github.com/Chocolate-lightning/moodle

commit 849002fab975bed782e66c29ed292d84ad67802d
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 19 Dec 2016 16:47:21 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-53044' of https://github.com/ak4t0sh/moodle

commit 8560d8e1f992c37c50e59d144ae34b12589302e5
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 19 Dec 2016 16:35:42 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-55715_m33v1' of https://github.com/sbourget/moodle

commit a7471c40b481b4dadefc136d6dacbeebdae87ad9
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 14 Dec 2016 00:34:52 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57125-master' of git://github.com/lameze/moodle

commit ae2bf1626cea207715b3ba20b54044b76904ded5
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 13 Dec 2016 22:55:50 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-56810_master' of https://github.com/Syxton/moodle

commit 2956ca50fa58e482236c56804076bf8e311cbf8b
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 13 Dec 2016 18:25:07 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57250_master' of git://github.com/markn86/moodle

commit ba78bd4f56ba78baed3129861675bb0d0449bf75
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 13 Dec 2016 17:45:15 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-56859-master' of https://github.com/snake/moodle

commit 92e20a1fa593c4d361fe47eb0ef622fc05822447
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 13 Dec 2016 17:26:10 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57074-master' of https://github.com/snake/moodle

commit 8791d254af576ff397265038fc9904fc7a16bdb7
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 13 Dec 2016 17:04:04 +0800
Tag:    v3.3.0-beta

Merge branch 'wip-MDL-57216-master' of git://github.com/abgreeve/moodle

commit b7f0ab491cce605fae53bb79eb05e74c5f0faa25
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 13 Dec 2016 16:47:33 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57182-master' of https://github.com/snake/moodle

commit 0183338c38521c6cc9112e3604488314583e6147
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 13 Dec 2016 16:45:50 +0800
Tag:    v3.3.0-beta

Merge branch 'wip-MDL-57257-master' of git://github.com/abgreeve/moodle

commit e36d9b3ead31569f2e5f394435f5cf0e01523e18
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 12 Dec 2016 22:08:34 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-56525' of https://github.com/ak4t0sh/moodle

commit 6d23f14a943cf729a3edc01afcdfa2c94da4476a
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 12 Dec 2016 21:17:48 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-55782-master-test' of git://github.com/ryanwyllie/moodle

commit 5304258829de396bd222f0700e1e29c8775ed7f1
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 12 Dec 2016 21:00:51 +0800
Tag:    v3.3.0-beta

Merge branch 'wip-mdl-52796' of https://github.com/rajeshtaneja/moodle

commit 5eeb5e89a9949c22ea410b9ae1b3b316f0f254cd
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 12 Dec 2016 20:46:39 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57198' of git://github.com/phager-at/moodle

commit 394fd5f92ed12f9a90e03255d885695c3215619f
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 12 Dec 2016 20:39:52 +0800
Tag:    v3.3.0-beta

Merge branch 'wip-MDL-57299-master' of git://github.com/abgreeve/moodle

commit 4d8c059cfac768691eb353d6612d4371ba2370b4
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 12 Dec 2016 20:23:22 +0800
Tag:    v3.3.0-beta

Merge branch 'wip-mdl-57325' of https://github.com/rajeshtaneja/moodle

commit daab2b520f9ff33dd567adb084b5eb0a6ba18e12
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 12 Dec 2016 20:21:31 +0800
Tag:    v3.3.0-beta

Merge branch 'wip-mdl-57314' of https://github.com/rajeshtaneja/moodle

commit 1483c172ede58b02af0485fdedad1c88f08902e0
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 12 Dec 2016 20:21:09 +0800
Tag:    v3.3.0-beta

Merge branch 'wip-mdl-57343' of https://github.com/rajeshtaneja/moodle

commit 1b846b8ed6f39c80102d9c9177d5ed01c624254d
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 12 Dec 2016 18:31:16 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57171-master-2' of git://github.com/junpataleta/moodle

commit 444017ca7e3a689b3fc60fd2aeb78be4d337ff70
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 12 Dec 2016 17:20:05 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-56566' of https://github.com/bostelm/moodle

commit dc81fdeb3e5cc2b633956b6ee227dc00738904e3
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 12 Dec 2016 17:06:38 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-55906-grading-table-filters-not-reset-master' of https://github.com/ilya-catalyst/moodle

commit d87177ae355a6f5be91da178424af014eed77f92
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 08 Dec 2016 16:43:18 +0800
Tag:    v3.3.0-beta

Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

commit ee1f658207ef4e1b947c3f0fed22ca79db45eff2
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 07 Dec 2016 18:16:54 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57283_master' of git://github.com/markn86/moodle

commit eec60baeca4683917170d6f24a402e9c0d721f2e
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 07 Dec 2016 16:45:16 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-56674-master' of https://github.com/kenneth-hendricks/moodle

commit be1b12490ef55e562ebf09c6f46f10eba8275ab6
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 06 Dec 2016 23:56:23 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-45873' of https://github.com/bostelm/moodle

commit b864c7fa1df58e5281907010008f7e8f9564e26d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 06 Dec 2016 23:50:36 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57284-master' of git://github.com/ankitagarwal/moodle

commit c4d9fd1afef016544f689a0ee807817e8560ee0e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 06 Dec 2016 20:48:09 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-53677-master' of git://github.com/ankitagarwal/moodle

commit dee51f01d6a7298d124275b8ed3ee830982915ab
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 06 Dec 2016 20:46:19 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-56836-master' of https://github.com/snake/moodle

commit 369382f7bfd2e00efd1a64035e1b5c9367b81504
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 06 Dec 2016 20:42:00 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-56233-32-mocksubmit' of https://github.com/roperto/moodle

commit 94d950601ccf247cdc1b8045a4d5c4a64d04826e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 06 Dec 2016 20:30:28 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-56778_master' of https://github.com/nadavkav/moodle

commit e2838e0e5d1f1af556130d34e2b6c93c6d4d4737
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 06 Dec 2016 20:25:36 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57199' of git://github.com/timhunt/moodle

commit 7cdc6974d4fa999cb5f959de3124cce78c705223
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 06 Dec 2016 19:08:08 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-56971-m' of https://github.com/micaherne/moodle

commit e1ac1788927c1b7ae5dcb70e9fd918bff78a6663
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 05 Dec 2016 23:48:27 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-56459-master' of git://github.com/FMCorz/moodle

commit d68562bdb97d6977506fccb0cc7c2f5823e2b4e4
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 05 Dec 2016 23:45:31 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-57256-master-legacylink' of git://github.com/mudrd8mz/moodle