0a85a7cc

By: Michael Lynch <git@mtlynch.io>

Merge remote-tracking branch 'b/m1-part2' into m1-part2

# Conflicts:
#	e2e/browse.spec.ts
#	e2e/media.spec.ts