based on git revision 6a5289ab8537c4d170474486d20987f0f453a679.
