Removed {% markup %} template tag, which is deprecated in Django 1.5, and was not used anyway.
Merge update for django 1.5