a5b84def

By: Michael Lynch <git@mtlynch.io>

Merge branch 'master' into edit-media

# Conflicts:
#	store/sqlite/media.go