Covers tasks/quotas/base.py with unit-tests
Merge remote-tracking branch 'origin/master'