Merge "Use exit(1), not exit(-1)"