Merge branch 'django1.4'