leap-16.1 Update from Factory #3

Open
michals wants to merge 2 commits from michals/gitea-tea:leap-16.1 into leap-16.1

2 Commits