Reset addon.xml to Frodo
Merge branch 'testing'