Updates to relect 781d3a495dfaeb19733e98f1cd982ea6fbd6af91 in upstream master.