[Merge] lp:~raj-abhilash1/postorius/bug_1004049 into lp:postorius