Pull in upstream changes#55

mslipper merged 2 commits intooptimismethereum-optimism/hive:optimismfrom

jg/sync_forkethereum-optimism/hive:jg/sync_forkCopy head branch name to clipboard