Merge pull request #1017 in develop
Merge branch 'hotfix/1016' into develop

Forward port #1016
Merge branch 'hotfix/1019' into develop

Forward port #1019
Merge branch 'master' into develop
Reverse version change
Merge branch 'hotfix/1020' into develop

Forward port #1020
Merge branch 'hotfix/1021' into develop

Forward port #1021
Merge branch 'hotfix/1022' into develop

Forward port #1022
Merge branch 'hotfix/1023' into develop

Forward port #1023
Merge branch 'hotfix/1024' into develop

Forward port #1024
Merge branch 'hotfix/1025' into develop

Forward port #1025
Merge branch 'hotfix/1026' into develop

Forward port #1026
Merge branch 'hotfix/1029' into develop

Forward port #1029
Merge branch 'hotfix/1030' into develop

Forward port #1030
Merge branch 'hotfix/1031' into develop

Forward port #1031
Merge branch 'hotfix/1033' into develop

Forward port #1033
Revert "Revert "Merge branch 'hotfix/1016'""

This reverts commit 0b0496ad9bd1f140b2bfb1c93ed0aaec786b80f0.
Comma in join() php block was in the wrong place.

Comma placed after // would get commented out, put comma before comment
Merge pull request #1044 in develop
Merge pull request #1015 in develop