remove addonopendroid
Merge remote-tracking branch 'origin/branding' into 2.1