[docker-io/f20] (2 commits) ...Merge branch 'master' into f20

[Lokesh Mandvekar]

Summary of changes:

0832c9e... iptables-fix.patch corrected (*)
  0695de1... Merge branch 'master' into f20

(*) This commit already existed in another branch; no separate mail sent