Conflicts: mediagoblin/gmg_commands/__init__.py
This commit sponsored by Libby Reinish. Thank you! :)