Merge branch 'wookong-dot-cht-hd-signer' of...

Merge branch 'wookong-dot-cht-hd-signer' of https://github.com/paritytech/substrate into wookong-dot-cht-hd-signer

# Conflicts:
#	subkey/src/main.rs
#	subkey/subhd/src/lib.rs