055b4d6d

By: Michael Lynch <git@mtlynch.io>

Merge branch 'master' into edit-media

# Conflicts:
#	e2e/fixtures.ts
#	handlers/about_test.go
#	handlers/page_data.go
#	handlers/routes.go