UPDATE
Merge branch 'addons'