Merge branch 'feedback-dialog' into makern
Merge branch 'makern' of https://github.com/makern/browser-extensions into makern