merge for bitcoin master