Merge branch 'hotfix/1.1.3'
implode call was reversed; fixed that. also declared missing fileSystem property.
Merge branch 'hotfix/1.1.4' into develop