Merge remote branch 'origin/qa' into release
Fixing minor bugs in operation.sql script
Fixing but in quota report widget
Merge branch 'release' of github.com:patrickdemond/mastodon into release
Fixing a bug in the quota report
Merge remote branch 'origin/release' into develop