Merge branch 'hotfix/#220-bugfix'
Merge branch 'develop'
#349 improved manage tab captions (config tabs)
Merge branch 'master' into develop
Merge branch 'master' into develop