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

[Lokesh Mandvekar]

Summary of changes:

0a007fd... 0.7.0 patched with commit 0ff9bc1 (*)
  a5b1820... Merge branch 'master' into f20

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