[oUF] Upstream update fbc1d02..f939159