Olivier Massot 411046ac32 fix merge conflicts %!s(int64=2) %!d(string=hai) anos
..
abilities 58424a85e7 v8-5075_fixes_after_tests_2 %!s(int64=2) %!d(string=hai) anos
theme.ts 91e3e1af63 various post-upgrade fixes %!s(int64=2) %!d(string=hai) anos