master #8

Merged
asmeron merged 13 commits from YanTheKaller/ubl-settings-manager:master into develop 3 years ago