Merge remote-tracking branch 'upstream/master' into discogs-subtrack-handling

Conflicts:
	docs/changelog.rst

beetsplug/scrub.py

@@ -123,7 +123,7 @@ class ScrubPlugin(BeetsPlugin):
                 self._log.error(u'could not open file to scrub: {0}',
                                 exc)
                 return
-            art = mf.art
+            images = mf.images
 
         # Remove all tags.
         self._scrub(item.path)
@@ -132,12 +132,12 @@ class ScrubPlugin(BeetsPlugin):
         if restore:
             self._log.debug(u'writing new tags after scrub')
             item.try_write()
-            if art:
+            if images:
                 self._log.debug(u'restoring art')
                 try:
                     mf = mediafile.MediaFile(util.syspath(item.path),
                                              config['id3v23'].get(bool))
-                    mf.art = art
+                    mf.images = images
                     mf.save()
                 except mediafile.UnreadableFileError as exc:
                     self._log.error(u'could not write tags: {0}', exc)

docs/changelog.rst

@@ -25,9 +25,14 @@ Fixes:
 * :doc:`/plugins/bpd`: Fix a crash on non-ASCII MPD commands. :bug:`2332`
 * :doc:`/plugins/scrub`: Avoid a crash when files cannot be read or written.
   :bug:`2351`
+* :doc:`/plugins/scrub`: The image type values on scrubbed files are preserved
+  instead of being reset to "other." :bug:`2339`
+* :doc:`/plugins/web`: Fix a crash on Python 3 when serving files from the
+  filesystem. :bug:`2353`
 * :doc:`/plugins/discogs`: Improve the handling of releases that contain
   subtracks. :bug:`2318`
 
+
 For plugin developers: new importer prompt choices (see :ref:`append_prompt_choices`), you can now provide new candidates for the user to consider.