* merged with tip (040f180a056b)