rf; discogs
bugfix
Merge branch 'master' into chrome_popup