Merge branch 'main' of https://vcs.maemo.org/git/livewp into main