Bugfixes:
https://github.com/devilry/devilry-django/issues/604
https://github.com/devilry/devilry-django/issues/605