Additional trivial merge patch from Jos