fixes bug 916563 - Update to Django 1.4.8 / 1.5.4

@brandonsavage r?