sharding/contracts: merge with master

Former-commit-id: fd5bf9ed3f541734c2b92363468afc75eafbee47 [formerly 3b4c6447c9c673a5d58242db4c9bb8f7fc9c4221]
Former-commit-id: e438fd2911e54b652e726d1cace5d0ad640e563a
This commit is contained in:
Terence Tsao 2018-05-13 16:29:21 -07:00
commit 43e48290dc

Diff Content Not Available