WIP: Test with both django 1.4 and 1.5