Bugfixes:
https://github.com/devilry/devilry-django/issues/560
https://github.com/devilry/devilry-django/issues/563