Merge latest fixes from the release tree for WHATSNEW.txt