cc2ebba8

By: Michael Lynch <git@mtlynch.io>

Merge branch 'master' into in-memory-store

# Conflicts:
#	handlers/media.go