Merge branch 'cherry-pick-273f94e9' into 'development'

Merge branch 'fix-context' into 'development'

See merge request !22

mayan/apps/common/templatetags/common_tags.py

@@ -83,10 +83,9 @@ def render_subtemplate(context, template_name, template_context):
     Renders the specified template with the mixed parent and
     subtemplate contexts
     """
-
-    new_context = Context(context)
+    new_context = Context(context.flatten())
     new_context.update(Context(template_context))
-    return get_template(template_name).render(new_context)
+    return get_template(template_name).render(new_context.flatten())
 
 
 @register.simple_tag