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