Merge branch 'hotfix/1033'

Close #1033
syntax error fix
Comma in join() php block was in the wrong place.

Comma placed after // would get commented out, put comma before comment
Merge pull request #1049 from motobreath/patch-3

Comma in join() php block was in the wrong place.
Merge pull request #1044
Merge pull request #1044 in develop