Merge branch 'release/2.4.0.7' into develop
Bump to development version 2.4.0.8dev
Upgrade to Active Record #647
Allow render_email to be used outside nereid context

render_email method required a nereid request context to work since it
used the render_template functionality of nereid.templating. This patch
allows jinja2.Template instances to be sent as text and html templates
in which case, these templates are rendered with the context, instead of
using nereid.template.render_template. This is useful if you want to
call render_email for example from a method in a request to trytond.
Allow render_email to be used outside nereid context

render_email method required a nereid request context to work since it
used the render_template functionality of nereid.templating. This patch
allows jinja2.Template instances to be sent as text and html templates
in which case, these templates are rendered with the context, instead of
using nereid.template.render_template. This is useful if you want to
call render_email for example from a method in a request to trytond.

Cherry-Picked from: a77f9efb472f313042e30a556ebeeb911c37319c
Merge branch 'feature/2.6' into develop
Prepare release 2.6.0.1
Merge branch 'release/2.6.0.1'