Merge branch 'frodo'

Conflicts:
Default.py
addon.xml