Merge from django-wiki master