Bring up-to-date with newer django