merged with bitcoin 0.9.2.1