merged with test-kitchen/master