based on git revision e69195c5f02fac32cff1ae895af57a110848abbc.
