Update from upstream (errbit/errbit)