Merge proposals dependent on lp:~therp-nl/therp-addons/7.0-fetchmail_invoice_fix_context_lang

1. 7.0-fetchmail_invoice_fix_context_lang
2. Dependent merge proposals