Upstream update

@fkm3 , @jfox85 : LG to pull?