Sync with bitcoin:bitcoin master