upstream changes
nspr formatting