b0aac007

By: Michael Lynch <git@mtlynch.io>

Merge remote-tracking branch 'origin/master' into import-webm

# Conflicts:
#	importers/media_test.go