Merge proposals dependent on lp:~vauxoo/addons-vauxoo/7.0-addons-vauxoo-email_template_followers-dev-julio

1. 7.0-addons-vauxoo-email_template_followers-dev-julio
2. Dependent merge proposals