Merge branch 'django-1.6' into recurring-events