Bring back deleted AddonBrowser (thanks queeup)
Merge commit '1c4562fcaff98c47d78b31a07022b62dc0ac5174'
Merge commit 'eb99b72004869b618892e5caf0bb34cc31ce1034'