oUF: merged upstream changes.