Merge branch 'master' into t8_templatetag
ticket:8 Obtaining app_label and model from ContentType object
ticket:8 Tested templatetag with Template and Context objects
Merge branch 't8_templatetag'