merge fix from master
merge fix from master

jcoady9/beets,PierreRust/beets,shanemikel/beets,Andypsamp/CODjunit,ruippeixotog/beets,drm00/beets,moodboom/beets,Dishwishy/beets,marcuskrahl/beets,LordSputnik/beets,mathstuf/beets,dfc/beets,mathstuf/beets,lightwang1/beets,drm00/beets,moodboom/beets,xsteadfastx/beets,randybias/beets,dfc/beets,asteven/beets,madmouser1/beets,ibmibmibm/beets,jmwatte/beets,Dishwishy/beets,m-urban/beets,shamangeorge/beets,YetAnotherNerd/beets,imsparsh/beets,jackwilsdon/beets,m-urban/beets,Andypsamp/CODjunit,mathstuf/beets,shamangeorge/beets,beetbox/beets,Wen777/beets,LordSputnik/beets,lengtche/beets,multikatt/beets,arabenjamin/beets,LordSputnik/beets,diego-plan9/beets,gabrielaraujof/beets,gabrielaraujof/beets,jayme-github/beets,xsteadfastx/beets,bj-yinyan/beets,drm00/beets,Freso/beets,ttsda/beets,Wen777/beets,jcoady9/beets,diego-plan9/beets,artemutin/beets,Andypsamp/CODjunit,lengtche/beets,tima/beets,randybias/beets,moodboom/beets,MyTunesFreeMusic/privacy-policy,Kraymer/beets,dfc/beets,bj-yinyan/beets,andremiller/beets,tima/beets,kareemallen/beets,Wen777/beets,kelvinhammond/beets,m-urban/beets,beetbox/beets,sadatay/beets,kelvinhammond/beets,arabenjamin/beets,sadatay/beets,sampsyo/beets,shanemikel/beets,jmwatte/beets,mried/beets,kelvinhammond/beets,ruippeixotog/beets,Andypsamp/CODfinalJUNIT,randybias/beets,mosesfistos1/beetbox,beetbox/beets,untitaker/beets,diego-plan9/beets,tima/beets,jcoady9/beets,parapente/beets,mosesfistos1/beetbox,tima/beets,shanemikel/beets,Freso/beets,sampsyo/beets,bj-yinyan/beets,PierreRust/beets,pkess/beets,pdf/beets,kareemallen/beets,parapente/beets,madmouser1/beets,imsparsh/beets,ttsda/beets,Freso/beets,pkess/beets,drm00/beets,pdf/beets,PierreRust/beets,Freso/beets,bj-yinyan/beets,MyTunesFreeMusic/privacy-policy,Dishwishy/beets,Kraymer/beets,madmouser1/beets,kelvinhammond/beets,sampsyo/beets,marcuskrahl/beets,beetbox/beets,mried/beets,artemutin/beets,marcuskrahl/beets,Andypsamp/CODjunit,multikatt/beets,untitaker/beets,lengtche/beets,YetAnotherNerd/beets,SusannaMaria/beets,asteven/beets,gabrielaraujof/beets,YetAnotherNerd/beets,mried/beets,MyTunesFreeMusic/privacy-policy,Andypsamp/CODfinalJUNIT,asteven/beets,lengtche/beets,SusannaMaria/beets,xsteadfastx/beets,andremiller/beets,gabrielaraujof/beets,mosesfistos1/beetbox,ruippeixotog/beets,jmwatte/beets,MyTunesFreeMusic/privacy-policy,pkess/beets,parapente/beets,krig/beets,multikatt/beets,ttsda/beets,artemutin/beets,mosesfistos1/beetbox,Andypsamp/CODfinalJUNIT,Andypsamp/CODfinalJUNIT,artemutin/beets,jayme-github/beets,lightwang1/beets,SusannaMaria/beets,Andypsamp/CODjunit,marcuskrahl/beets,sampsyo/beets,sadatay/beets,Andypsamp/CODfinalJUNIT,krig/beets,jmwatte/beets,shamangeorge/beets,jbaiter/beets,PierreRust/beets,lightwang1/beets,shamangeorge/beets,moodboom/beets,Dishwishy/beets,ibmibmibm/beets,krig/beets,Kraymer/beets,mried/beets,jcoady9/beets,diego-plan9/beets,asteven/beets,swt30/beets,untitaker/beets,mathstuf/beets,xsteadfastx/beets,ttsda/beets,arabenjamin/beets,ibmibmibm/beets,LordSputnik/beets,arabenjamin/beets,swt30/beets,imsparsh/beets,Kraymer/beets,shanemikel/beets,pkess/beets,jackwilsdon/beets,sadatay/beets,jackwilsdon/beets,swt30/beets,dfc/beets,ruippeixotog/beets,jbaiter/beets,imsparsh/beets,lightwang1/beets,randybias/beets,madmouser1/beets,YetAnotherNerd/beets,ibmibmibm/beets,andremiller/beets,kareemallen/beets,multikatt/beets,m-urban/beets,jackwilsdon/beets,parapente/beets,kareemallen/beets,untitaker/beets,swt30/beets,SusannaMaria/beets