Merge latest changes from beets (see https://github.com/sampsyo/beets/blob/5ba52d669ee531cec9dd6a4214ecafa94c2684bf/beets/mediafile.py)
Make the tests run again