merge heads

diff --cc Misc/NEWS
index 009d8e692365820e36b6288074b7412af2eef396,0e369030fdeb7a52e5c4de36cc5004bde2c7c856..c79713fa681a1efaef3c142ddcaacc641c38cbde
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -31,9 -31,8 +31,11 @@@ Core and Builtin
  Library
  -------
  
+ - Issue 14773: Fix os.fwalk() failing on dangling symlinks.
+ 
 +- Issue #12541: Be lenient with quotes around Realm field of HTTP Basic
 +  Authentation in urllib2.
 +
  - Issue 14807: move undocumented tarfile.filemode() to stat.filemode() and add
    doc entry. Add tarfile.filemode alias with deprecation warning.