5935ad12

By: Michael Lynch <git@mtlynch.io>

Merge master into slice-0.5

Resolve handler test conflicts by adopting master's shared helpers.