6186897e

By: Michael Lynch <git@mtlynch.io>

Merge remote-tracking branch 'origin/master' into slice-0.5

# Conflicts:
#	e2e/fixtures.ts