master #200

Open
asmeron wants to merge 3 commits from YanTheKaller/ubl-settings-datetime:master into master