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

1. 7.0-fetchmail-invoice_fix_journal_selection
2. Dependent merge proposals