Hand apply e4615ebe1cef519e3aaee317ca6d319fbb9a0903 from master; put job errors in...