Upstream update

@jfox85 , @fkm3 : Please OK ASAP.