Fork of django to work on various tickets