denisarnaud pushed to travelccm (master). "Upstream update"