Merge pull request #3455 from Shulyaka/postfix-3.1.3