Merge branch 'master' into chankillo

diff --cc main.cf
index e1b7d669d6b05a5617d23448d7ea5bb93ac58586,43b0f1e307219bb5b2d3dc315c94279e633feb97..8baec175c1a2251eccc6822b603d0ac245554670
--- 1/main.cf
--- 2/main.cf
+++ b/main.cf
@@@ -257,7 -257,7 +258,7 @@@ unknown_local_recipient_reject_code = 5
  # (the value on the table right-hand side is not used).
  #
  # Added by Alex Dehnert
- mynetworks = 66.92.29.156/32, 66.92.29.144/32, 127.0.0.1/32, 18.111.8.18/32, 18.102.208.15/32, 172.17.0.2/32
 -mynetworks = 66.92.29.156/32, 66.92.29.144/32, 127.0.0.1/32, 18.111.8.18/32, 18.102.208.15/32, [::1]/128
++mynetworks = 66.92.29.156/32, 66.92.29.144/32, 127.0.0.1/32, [::1]/128, 18.111.8.18/32, 18.102.208.15/32, 172.17.0.2/32
  #mynetworks = 168.100.189.0/28, 127.0.0.0/8
  #mynetworks = $config_directory/mynetworks
  #mynetworks = hash:/etc/postfix/network_table

diff --cc master.cf
Simple merge