based on git revision 702867d5b4d2c05e90dadbe4af1f7bc0958d94ee.
