Jenkins 114: Automatic recursive merge from upstream.