[Merge] lp:~godricglow/postorius/bug_1308219 into lp:postorius