Changelog for #732
Merge branch 'master' of github.com:sampsyo/beets
Changelog & style for #846 (fix #836)