Merge from HEAD - updates to the build farm, /bin/sh can swallow return values,