Merge branch 'addon-manager' into fuzzyfinder