Jenkins 164: Automatic recursive merge from upstream.