Commit from Mozilla Verbatim by user steekid.: 3763 of 3763 strings translated (0 fuzzy).
Merge branch 'master' of ssh://github.com/mozilla/zamboni
Commit from Mozilla Verbatim by user jasnapaka@jasnapaka.com.: 3733 of 3763 strings translated (0 fuzzy).
Commit from Mozilla Verbatim by user jasnapaka@jasnapaka.com.: 3749 of 3763 strings translated (0 fuzzy).
Commit from Mozilla Verbatim by user petercpg@mail.moztw.org.: 3763 of 3763 strings translated (0 fuzzy).
Disable files when their version is deleted (bug 980916)
check provider count when creating AccountListFormSet (bug 1007729)
Merge pull request #2037 from mstriemer/handle-payment-providers-in-tests-1007729

check provider count when creating AccountListFormSet (bug 1007729)
Remove activity log tables and rename marketplace's (bug 1004786)
Updated migration to clear some extra foreign keys
Revert "Updated migration to clear some extra foreign keys"

This reverts commit 8d3f935a1104201df4e2ede2ed8d4ebf92ca9091.
Revert "Remove activity log tables and rename marketplace's (bug 1004786)"

This reverts commit 489205f6019b3c5a646ba5a9e1ea23dc2b8b3300.
Remove activity log tables and rename marketplace's (bug 1004786)
Fixed tests
Clear leftover addon logs (which are only themes)
Removed client_data filtering from ratings (bug 1007800)

This wasn't getting populated when ratings were recorded so mature
regions showed no ratings.