Merge pull request #5749 in master
Merge pull request #5846
Merge pull request #5846 in develop
Merge pull request #5846 in master
[#5616] Adapt array indentation to PSR-2 guidelines by default
Fixes #5162
remove ending space character from comment
Merge pull request #5385
Merge pull request #5385 in develop
Merge pull request #5385 in master
Merge pull request #5523
Merge pull request #5523 in develop
Merge pull request #5523 in master
Merge pull request #5707
Merge pull request #5707 in develop
Merge pull request #5707 in master
Merge pull request #5546
Merge pull request #5546 in develop
Merge pull request #5546 in master
#5665 Fix in test for JsonStrategy