Merge remote-tracking branch 'origin/perp-wasm' into perp-wasm

# Conflicts:
#	bindings/wasm/src/tx_types/contract/funding.rs
#	bindings/wasm/src/tx_types/contract/update_global_var.rs