Bugfixes for 1.4.x. Fixes:
Fixed https://github.com/devilry/devilry-django/issues/521
Usable workaround for https://github.com/devilry/devilry-django/issues/520