Merge branch 'master' into processing

Conflicts:
	mediagoblin/db/migrations.py

diff --cc mediagoblin/db/migrations.py
index 797d39de1010373b04c8cd7293fdaafaacb50e69,8c0881450b6dc849d51ba1746a1cd431d0a83ae1..36bca5b3c280644d657298905ba2ba5b8e2554b7
--- 1/mediagoblin/db/migrations.py
--- 2/mediagoblin/db/migrations.py
+++ b/mediagoblin/db/migrations.py
@@@ -53,14 -53,12 +53,24 @@@ def mediaentry_mediafiles_main_to_origi
  
          collection.save(document)
  
 +
  @RegisterMigration(3)
+ def mediaentry_remove_thumbnail_file(database):
+     """
+     Use media_files['thumb'] instead of media_entries['thumbnail_file']
+     """
+     database['media_entries'].update(
+         {'thumbnail_file': {'$exists': True}},
+         {'$unset': {'thumbnail_file': 1}},
++
++
++@RegisterMigration(4)
 +def mediaentry_add_queued_task_id(database):
 +    """
 +    Add the 'queued_task_id' field for entries that don't have it.
 +    """
 +    collection = database['media_entries']
 +    collection.update(
 +        {'queued_task_id': {'$exists': False}},
 +        {'$set': {'queued_task_id': None}},
          multi=True)

diff --cc mediagoblin/db/models.py
Simple merge