Merge branch 'issue-1049' into 'master'
Fixes #1049: system setting cannot be saved
See merge request !24
Merge branch 'issue-1049' into 'master'
Fixes #1049: system setting cannot be saved
See merge request !24