Merge branch 'hotfix/1.6.1'
Fix missing attributes in plugin options for file upload and select2
Merge branch 'hotfix/1.6.2' into develop