Port fixes from #716 to master - #733

Merged

markstory merged 3 commits into

Jan 31, 2020

Commits on Jan 29, 2020

Port fixes from #716 to master
markstory
committed
137f0ae
Fix test.
markstory
committed
f55d474

Commits on Jan 31, 2020

Stop using extract()
markstory
committed
56e594b