civicrm-core.git
3 years agoRemove deprecated code ids['userId']
eileen [Sat, 15 Aug 2020 05:32:55 +0000 (17:32 +1200)]
Remove deprecated code ids['userId']

These lines were deprecated 7 months ago and were pretty edge case to start with

3 years agoMerge pull request #18135 from colemanw/daoVersions
Seamus Lee [Fri, 14 Aug 2020 02:09:04 +0000 (12:09 +1000)]
Merge pull request #18135 from colemanw/daoVersions

API - Add upgrade-safe checks to ensure table exists before reading

3 years agoMerge pull request #18138 from eileenmcnaughton/dao
Seamus Lee [Fri, 14 Aug 2020 01:23:05 +0000 (11:23 +1000)]
Merge pull request #18138 from eileenmcnaughton/dao

Deprecate 'trapException' in DAO::executeQuery

3 years agoMerge pull request #18139 from totten/master-region-bits
Matthew Wire [Thu, 13 Aug 2020 17:16:07 +0000 (18:16 +0100)]
Merge pull request #18139 from totten/master-region-bits

(REF) CRM_Core_Region - Remove unused bits

3 years agoDeprecate 'trapException' inn DAO::executeQuery
eileen [Thu, 13 Aug 2020 08:54:26 +0000 (20:54 +1200)]
Deprecate 'trapException' inn DAO::executeQuery

    We are pretty heavily moving towards using exceptions so we should deprecate this. It seems the
    fillWithSql is just converting the error to an exception so we shouldn't avoid it

3 years agoSuppress errors when reading DAO version constants
Coleman Watts [Thu, 13 Aug 2020 02:01:24 +0000 (22:01 -0400)]
Suppress errors when reading DAO version constants

3 years agoDAO - only check version on fields from core tables
Coleman Watts [Wed, 12 Aug 2020 20:58:55 +0000 (16:58 -0400)]
DAO - only check version on fields from core tables

3 years agoLog warning when attempting to access nonexistant table from api
Coleman Watts [Wed, 12 Aug 2020 20:50:32 +0000 (16:50 -0400)]
Log warning when attempting to access nonexistant table from api

3 years agoCleanup CRM_Utils_Check version safeguard with APIv4
Coleman Watts [Wed, 12 Aug 2020 18:50:37 +0000 (14:50 -0400)]
Cleanup CRM_Utils_Check version safeguard with APIv4

3 years agoEarly return during APIv4::get if table doesn't exist
Coleman Watts [Wed, 12 Aug 2020 15:44:39 +0000 (11:44 -0400)]
Early return during APIv4::get if table doesn't exist

If there are pending upgrades, checks if table exists before attempting to read from it.

3 years agoRegenerate DAO files
Coleman Watts [Fri, 7 Aug 2020 20:13:08 +0000 (16:13 -0400)]
Regenerate DAO files

3 years agoCodeGen - Add EXT and TABLE_ADDED to each DAO file
Coleman Watts [Fri, 7 Aug 2020 19:27:51 +0000 (15:27 -0400)]
CodeGen - Add EXT and TABLE_ADDED to each DAO file

3 years agoMerge pull request #17956 from eileenmcnaughton/export_phone
Seamus Lee [Wed, 12 Aug 2020 23:51:57 +0000 (09:51 +1000)]
Merge pull request #17956 from eileenmcnaughton/export_phone

dev/core#1661 Allow phones with types longer than 16 chars to export

3 years agoMerge pull request #18131 from demeritcowboy/move-isssldsn
Seamus Lee [Wed, 12 Aug 2020 23:08:02 +0000 (09:08 +1000)]
Merge pull request #18131 from demeritcowboy/move-isssldsn

[REF] Move isSSLDSN() function to avoid potential problems

3 years agoMerge pull request #18134 from colemanw/deprecateCheckVersion
colemanw [Wed, 12 Aug 2020 17:45:13 +0000 (13:45 -0400)]
Merge pull request #18134 from colemanw/deprecateCheckVersion

Deprecate/remove unused checkVersion() functions

3 years agoMerge pull request #18132 from yashodha/dev-1944
colemanw [Wed, 12 Aug 2020 17:42:41 +0000 (13:42 -0400)]
Merge pull request #18132 from yashodha/dev-1944

(dev/core#1944) Add new columns to mailing summary report

3 years agoDeprecate unused CRM_Core_DAO::checkVersion() and remove unused CRM_Upgrade_Form...
Coleman Watts [Wed, 12 Aug 2020 14:21:49 +0000 (10:21 -0400)]
Deprecate unused CRM_Core_DAO::checkVersion() and remove unused CRM_Upgrade_Form::checkVersion()

3 years agomove function to avoid problems
demeritcowboy [Wed, 12 Aug 2020 03:12:41 +0000 (23:12 -0400)]
move function to avoid problems

3 years agoMerge pull request #18094 from colemanw/ets
Seamus Lee [Wed, 12 Aug 2020 04:24:27 +0000 (14:24 +1000)]
Merge pull request #18094 from colemanw/ets

CodeGen - Add use statement to extensions DAO files

3 years ago(dev/core#1944) Add new columns to mailing summary report
yashodha [Wed, 12 Aug 2020 03:24:47 +0000 (08:54 +0530)]
(dev/core#1944) Add new columns to mailing summary report

3 years agoDAO.tpl - use tsFunctionName for extension support
Coleman Watts [Wed, 12 Aug 2020 02:53:53 +0000 (22:53 -0400)]
DAO.tpl - use tsFunctionName for extension support

3 years agoMerge pull request #18128 from civicrm/5.29
Seamus Lee [Wed, 12 Aug 2020 01:32:19 +0000 (11:32 +1000)]
Merge pull request #18128 from civicrm/5.29

5.29

3 years agoMerge pull request #18126 from eileenmcnaughton/dupe529
Seamus Lee [Tue, 11 Aug 2020 23:23:36 +0000 (09:23 +1000)]
Merge pull request #18126 from eileenmcnaughton/dupe529

dev/core#1934 fix regression on merging contacts with settings using contact_id

3 years agoMerge pull request #18123 from seamuslee001/dev_core_1936_alternate
Seamus Lee [Tue, 11 Aug 2020 22:49:39 +0000 (08:49 +1000)]
Merge pull request #18123 from seamuslee001/dev_core_1936_alternate

dev/core#1936 Make the price field value label field not required

3 years agodev/core#1934 fix regression on merging contacts with settings using contact_id
eileen [Tue, 11 Aug 2020 21:38:05 +0000 (09:38 +1200)]
dev/core#1934 fix regression on merging contacts with settings using contact_id

This is an interim fix to a reported regression. I'll look at more carefully in master when time permits

3 years agodev/core#1936 Make the price field value label field not required
Seamus Lee [Tue, 11 Aug 2020 00:09:36 +0000 (10:09 +1000)]
dev/core#1936 Make the price field value label field not required

Fix test and ensure default value is NULL

3 years agoMerge pull request #18095 from demeritcowboy/no-db
Eileen McNaughton [Tue, 11 Aug 2020 08:03:17 +0000 (20:03 +1200)]
Merge pull request #18095 from demeritcowboy/no-db

dev/core#1926 - Towards supporting SSL for mysql connections - remove DB::connect that doesn't add anything

3 years agoMerge pull request #18122 from seamuslee001/master
Seamus Lee [Tue, 11 Aug 2020 00:18:06 +0000 (10:18 +1000)]
Merge pull request #18122 from seamuslee001/master

5.29

3 years agoMerge in 5.29
Seamus Lee [Tue, 11 Aug 2020 00:16:31 +0000 (10:16 +1000)]
Merge in 5.29

3 years agoMerge pull request #18116 from mattwire/phpnoticecontributionpage
Eileen McNaughton [Tue, 11 Aug 2020 00:09:35 +0000 (12:09 +1200)]
Merge pull request #18116 from mattwire/phpnoticecontributionpage

Fix PHP notice on contribution page

3 years agoMerge pull request #18119 from demeritcowboy/document-hidden-buttons
Seamus Lee [Mon, 10 Aug 2020 22:08:17 +0000 (08:08 +1000)]
Merge pull request #18119 from demeritcowboy/document-hidden-buttons

[NFC] Add code comments about hidden but still used buttons

3 years agoMerge pull request #18115 from sunilpawar/dev_1943
Seamus Lee [Mon, 10 Aug 2020 20:55:39 +0000 (06:55 +1000)]
Merge pull request #18115 from sunilpawar/dev_1943

dev/core#1943 add functionality to add civicrm log into Drupal access log

3 years agocomments about hidden but still used buttons
demeritcowboy [Sun, 9 Aug 2020 05:07:57 +0000 (01:07 -0400)]
comments about hidden but still used buttons

3 years agoMerge pull request #18117 from mattwire/529_master
Eileen McNaughton [Mon, 10 Aug 2020 19:53:31 +0000 (07:53 +1200)]
Merge pull request #18117 from mattwire/529_master

5.29 to master

3 years agoMore radical cleanup of button CSS
Andrew Hunt [Thu, 6 Aug 2020 22:17:31 +0000 (18:17 -0400)]
More radical cleanup of button CSS

3 years agoFix CSS for new buttons
Andrew Hunt [Thu, 6 Aug 2020 22:00:58 +0000 (18:00 -0400)]
Fix CSS for new buttons

3 years agoFix JS for input buttons that are now button buttons
Andrew Hunt [Thu, 6 Aug 2020 20:06:56 +0000 (16:06 -0400)]
Fix JS for input buttons that are now button buttons

3 years agoRemove deprecated submitOnce js function
Andrew Hunt [Thu, 6 Aug 2020 19:36:47 +0000 (15:36 -0400)]
Remove deprecated submitOnce js function

3 years agoNo need for crm-button wrappers for real buttons
Andrew Hunt [Thu, 6 Aug 2020 18:57:11 +0000 (14:57 -0400)]
No need for crm-button wrappers for real buttons

3 years agoGive buttons a value when the submitted value is used to identify them
Andrew Hunt [Thu, 6 Aug 2020 17:55:52 +0000 (13:55 -0400)]
Give buttons a value when the submitted value is used to identify them

3 years agoPut icons inside of button elements
Andrew Hunt [Thu, 6 Aug 2020 17:12:36 +0000 (13:12 -0400)]
Put icons inside of button elements

3 years agoSwap out button/submit inputs for button elements
Andrew Hunt [Thu, 6 Aug 2020 15:19:56 +0000 (11:19 -0400)]
Swap out button/submit inputs for button elements

3 years agoCorrection to change priority level
Sunil Pawar [Mon, 10 Aug 2020 13:30:45 +0000 (19:00 +0530)]
Correction to change priority level

3 years agoMerge pull request #18091 from agh1/xbutton-529
Matthew Wire [Mon, 10 Aug 2020 12:42:37 +0000 (13:42 +0100)]
Merge pull request #18091 from agh1/xbutton-529

Swap out button/submit inputs for button elements

3 years agoFix PHP notice on contribution page
Matthew Wire [Mon, 10 Aug 2020 12:31:07 +0000 (13:31 +0100)]
Fix PHP notice on contribution page

3 years agosmall correction
Sunil Pawar [Mon, 10 Aug 2020 12:12:20 +0000 (17:42 +0530)]
small correction

3 years agodev/core#1943 add functionality to add civicrm log into Drupal access log
Sunil Pawar [Mon, 10 Aug 2020 12:09:22 +0000 (17:39 +0530)]
dev/core#1943 add functionality to add civicrm log into Drupal access log

3 years agoMerge pull request #18112 from eileenmcnaughton/paytest
Eileen McNaughton [Mon, 10 Aug 2020 10:06:32 +0000 (22:06 +1200)]
Merge pull request #18112 from eileenmcnaughton/paytest

[NFC] [Test] Initial testing on event payment forms.

3 years ago[Ref] [Test] Update Authorize.net test to use the trait
eileen [Mon, 10 Aug 2020 05:38:30 +0000 (17:38 +1200)]
[Ref] [Test] Update Authorize.net test to use the trait

3 years ago[NFC] [Test] Intial testing on event payment forms.
eileen [Mon, 10 Aug 2020 04:12:02 +0000 (16:12 +1200)]
[NFC] [Test] Intial testing on event payment forms.

I'm trying to work on improving our testing of payment forms. I started with 3 event forms but there were
enough challenges that for this commit I'm just adding tests on one form. As noted in the code comments
it makes sense for this test to be in the extension but I want to work through the challenges on the
other forms before finalising any helper functions to the point where they are available to extensions.

This is actually a bit of a break through as it's the first time we have testing on a form flow - ie
submitting the first form and then the second. It was quite painful

3 years agoMerge pull request #18110 from eileenmcnaughton/xml
Seamus Lee [Mon, 10 Aug 2020 00:55:34 +0000 (10:55 +1000)]
Merge pull request #18110 from eileenmcnaughton/xml

Add Serialize key to payment_processor field for Event & Contribution Page

3 years agoMerge pull request #18109 from eileenmcnaughton/format
Seamus Lee [Sun, 9 Aug 2020 23:33:30 +0000 (09:33 +1000)]
Merge pull request #18109 from eileenmcnaughton/format

[NFC] Array formatting

3 years agoMerge pull request #18108 from eileenmcnaughton/paytest
Seamus Lee [Sun, 9 Aug 2020 23:33:13 +0000 (09:33 +1000)]
Merge pull request #18108 from eileenmcnaughton/paytest

Remove unused variable

3 years agoAdd Serialize key to payment_processor field for Event & ContributionPage
eileen [Sun, 9 Aug 2020 23:03:05 +0000 (11:03 +1200)]
Add Serialize key to payment_processor field for Event & ContributionPage

The DAO can handle arrays if it knows the format now...

3 years agoRemove unused variable
eileen [Sun, 9 Aug 2020 21:44:02 +0000 (09:44 +1200)]
Remove unused variable

I spotted this variable as defined but unused - let's remove

3 years ago[NFC] Array formatting
eileen [Sun, 9 Aug 2020 21:55:11 +0000 (09:55 +1200)]
[NFC] Array formatting

This is a straight up IDE reformat to get rid of old array syntax.

IDE had some whitespace thoughts with I'm neutral on - if Jenkins is too then all good IMHO

3 years agoMerge pull request #18104 from civicrm/5.29
Seamus Lee [Sat, 8 Aug 2020 07:04:10 +0000 (17:04 +1000)]
Merge pull request #18104 from civicrm/5.29

5.29

3 years agoMerge pull request #18101 from demeritcowboy/eventcart-settingcheck
Seamus Lee [Sat, 8 Aug 2020 04:27:00 +0000 (14:27 +1000)]
Merge pull request #18101 from demeritcowboy/eventcart-settingcheck

dev/event#40 - EventCart - Check legacy setting until extension is public

3 years agoMerge pull request #18100 from civicrm/5.29
Seamus Lee [Sat, 8 Aug 2020 01:35:44 +0000 (11:35 +1000)]
Merge pull request #18100 from civicrm/5.29

5.29

3 years agocheck legacy setting until extension is public
demeritcowboy [Sat, 8 Aug 2020 00:59:20 +0000 (20:59 -0400)]
check legacy setting until extension is public

3 years agoMerge pull request #18068 from seamuslee001/dev_wordpress_66
Seamus Lee [Sat, 8 Aug 2020 00:09:19 +0000 (10:09 +1000)]
Merge pull request #18068 from seamuslee001/dev_wordpress_66

dev/wordpress#66 Re-instate newer variables but with more support for…

3 years agoMerge pull request #18097 from demeritcowboy/mysqli
Seamus Lee [Sat, 8 Aug 2020 00:07:15 +0000 (10:07 +1000)]
Merge pull request #18097 from demeritcowboy/mysqli

There is no "I" in mysqli - oh wait there is

3 years agoMerge pull request #18098 from civicrm/5.29
Eileen McNaughton [Fri, 7 Aug 2020 22:59:56 +0000 (10:59 +1200)]
Merge pull request #18098 from civicrm/5.29

5.29 to master

3 years agoMerge pull request #18092 from seamuslee001/preimum_onbehalfof_fix
Eileen McNaughton [Fri, 7 Aug 2020 22:59:19 +0000 (10:59 +1200)]
Merge pull request #18092 from seamuslee001/preimum_onbehalfof_fix

[REF] Fix jquery validation for on behalf of fields when combined wit…

3 years agoMerge pull request #17919 from seamuslee001/nfc_locale_documentation
Eileen McNaughton [Fri, 7 Aug 2020 22:26:23 +0000 (10:26 +1200)]
Merge pull request #17919 from seamuslee001/nfc_locale_documentation

[NFC] Update locale over-ride documentation to mention that it is mos…

3 years agomysqli
demeritcowboy [Fri, 7 Aug 2020 22:02:54 +0000 (18:02 -0400)]
mysqli

3 years agoREF - add helper function to get codeGen tpl
Coleman Watts [Fri, 7 Aug 2020 17:05:52 +0000 (13:05 -0400)]
REF - add helper function to get codeGen tpl

3 years agounneeded connect call
demeritcowboy [Fri, 7 Aug 2020 16:05:13 +0000 (12:05 -0400)]
unneeded connect call

3 years agoMerge pull request #18093 from colemanw/expFix
Seamus Lee [Fri, 7 Aug 2020 04:18:17 +0000 (14:18 +1000)]
Merge pull request #18093 from colemanw/expFix

APIv4 Explorer - Fix possible undefined index

3 years agoCodeGen - Add use statement to extensions DAO files
Coleman Watts [Fri, 7 Aug 2020 03:59:16 +0000 (23:59 -0400)]
CodeGen - Add use statement to extensions DAO files

3 years agoMerge pull request #17934 from eileenmcnaughton/conttype
colemanw [Fri, 7 Aug 2020 02:59:08 +0000 (22:59 -0400)]
Merge pull request #17934 from eileenmcnaughton/conttype

[REF] Update subtypeInfo function to leverage getAllContactTypes

3 years agoAPIv4 Explorer - Fix possible undefined index
Coleman Watts [Thu, 6 Aug 2020 19:11:10 +0000 (15:11 -0400)]
APIv4 Explorer - Fix possible undefined index

3 years agoMerge pull request #18047 from eileenmcnaughton/ent_ref
Seamus Lee [Fri, 7 Aug 2020 02:18:16 +0000 (12:18 +1000)]
Merge pull request #18047 from eileenmcnaughton/ent_ref

[REF] Fix metadata label for contribution_page_id

3 years ago[REF] Fix jquery validation for on behalf of fields when combined with a preimum
Seamus Lee [Fri, 7 Aug 2020 02:09:55 +0000 (12:09 +1000)]
[REF] Fix jquery validation for on behalf of fields when combined with a preimum

3 years agoMerge pull request #18090 from civicrm/5.29
Seamus Lee [Fri, 7 Aug 2020 00:20:38 +0000 (10:20 +1000)]
Merge pull request #18090 from civicrm/5.29

5.29

3 years agoMerge pull request #17950 from lcdservices/dev-core-1895
Seamus Lee [Thu, 6 Aug 2020 22:53:24 +0000 (08:53 +1000)]
Merge pull request #17950 from lcdservices/dev-core-1895

dev/core#1895 fix first/last name adv search

3 years agoMore radical cleanup of button CSS
Andrew Hunt [Thu, 6 Aug 2020 22:17:31 +0000 (18:17 -0400)]
More radical cleanup of button CSS

3 years agoFix CSS for new buttons
Andrew Hunt [Thu, 6 Aug 2020 22:00:58 +0000 (18:00 -0400)]
Fix CSS for new buttons

3 years agoFix JS for input buttons that are now button buttons
Andrew Hunt [Thu, 6 Aug 2020 20:06:56 +0000 (16:06 -0400)]
Fix JS for input buttons that are now button buttons

3 years agoRemove deprecated submitOnce js function
Andrew Hunt [Thu, 6 Aug 2020 19:36:47 +0000 (15:36 -0400)]
Remove deprecated submitOnce js function

3 years agoNo need for crm-button wrappers for real buttons
Andrew Hunt [Thu, 6 Aug 2020 18:57:11 +0000 (14:57 -0400)]
No need for crm-button wrappers for real buttons

3 years agoGive buttons a value when the submitted value is used to identify them
Andrew Hunt [Thu, 6 Aug 2020 17:55:52 +0000 (13:55 -0400)]
Give buttons a value when the submitted value is used to identify them

3 years agoPut icons inside of button elements
Andrew Hunt [Thu, 6 Aug 2020 17:12:36 +0000 (13:12 -0400)]
Put icons inside of button elements

3 years agoSwap out button/submit inputs for button elements
Andrew Hunt [Thu, 6 Aug 2020 15:19:56 +0000 (11:19 -0400)]
Swap out button/submit inputs for button elements

3 years agoMerge pull request #18088 from agh1/forcebackend
Seamus Lee [Thu, 6 Aug 2020 22:35:44 +0000 (08:35 +1000)]
Merge pull request #18088 from agh1/forcebackend

dev/core#1905 force backend links for new "configure" buttons

3 years agoMerge pull request #18089 from colemanw/api4cv
Eileen McNaughton [Thu, 6 Aug 2020 22:33:45 +0000 (10:33 +1200)]
Merge pull request #18089 from colemanw/api4cv

APIv4 Explorer: Generate short cv code

3 years agoMerge pull request #18085 from totten/5.29-periodic
Seamus Lee [Thu, 6 Aug 2020 21:27:55 +0000 (07:27 +1000)]
Merge pull request #18085 from totten/5.29-periodic

dev/core#1932 - Make status-checks more polite during upgrade

3 years agodev/wordpress#66 Re-instate newer variables but with more support for legacy file...
Seamus Lee [Tue, 4 Aug 2020 20:59:25 +0000 (06:59 +1000)]
dev/wordpress#66 Re-instate newer variables but with more support for legacy file systems

3 years agoAPIv4 Explorer: Generate short cv code
Coleman Watts [Thu, 6 Aug 2020 18:36:10 +0000 (14:36 -0400)]
APIv4 Explorer: Generate short cv code

3 years agodev/core#1905 force backend links for new "configure" buttons
Andrew Hunt [Thu, 6 Aug 2020 18:31:40 +0000 (14:31 -0400)]
dev/core#1905 force backend links for new "configure" buttons

3 years agodev/core#1932 - Make status-checks more polite during upgrade
Tim Otten [Thu, 6 Aug 2020 09:04:36 +0000 (02:04 -0700)]
dev/core#1932 - Make status-checks more polite during upgrade

Before
------

If you happen to run a status-check (eg `showPeriodicAlerts()`) in the interim between
downloading code and running DB upgrades, then you'll get weird failures.

After
-----

The status-checks are able to complete.

Technical Details
-----------------

(1) I figure that this conditional is lightweight because it relies on data
that's read-once and then cached in memory:

```
CRM_Utils_System::version() !== CRM_Core_BAO_Domain::version()
```

(2) The easiest way to reproduce is to get a DB from before 4.7 and coerce
`CRM_Utils_Check::CHECK_TIMER`.

3 years agoMerge pull request #18027 from seamuslee001/pear_db_composer
Seamus Lee [Thu, 6 Aug 2020 06:43:13 +0000 (16:43 +1000)]
Merge pull request #18027 from seamuslee001/pear_db_composer

[REF] Deploy Pear DB package using composer

3 years agoSet version to 5.30.alpha1
CiviCRM [Thu, 6 Aug 2020 06:40:29 +0000 (06:40 +0000)]
Set version to 5.30.alpha1

3 years agoSet version to 5.29.beta1
CiviCRM [Thu, 6 Aug 2020 06:23:07 +0000 (06:23 +0000)]
Set version to 5.29.beta1

3 years agoMerge pull request #18080 from seamuslee001/dev_core_1928
Seamus Lee [Thu, 6 Aug 2020 03:54:01 +0000 (13:54 +1000)]
Merge pull request #18080 from seamuslee001/dev_core_1928

dev/core#1928 Fix HTML5 error due to required attribute being set swi…

3 years agoMerge pull request #18084 from civicrm/5.28
Seamus Lee [Thu, 6 Aug 2020 03:25:30 +0000 (13:25 +1000)]
Merge pull request #18084 from civicrm/5.28

5.28

3 years agoMerge pull request #18083 from totten/5.28-rn
Tim Otten [Thu, 6 Aug 2020 03:23:56 +0000 (20:23 -0700)]
Merge pull request #18083 from totten/5.28-rn

(NFC) 5.28.0.md - Describe last minute PR. Random copyedits.

3 years agoMerge pull request #18082 from seamuslee001/master
Seamus Lee [Thu, 6 Aug 2020 02:53:29 +0000 (12:53 +1000)]
Merge pull request #18082 from seamuslee001/master

5.28

3 years ago5.28.0.md - Describe last minute PR. Random copyedits.
Tim Otten [Thu, 6 Aug 2020 02:47:27 +0000 (19:47 -0700)]
5.28.0.md - Describe last minute PR. Random copyedits.

3 years agoMerge in 5.28
Seamus Lee [Thu, 6 Aug 2020 02:38:20 +0000 (12:38 +1000)]
Merge in 5.28