d2818c7e

By: Michael Lynch <git@mtlynch.io>

Merge branch 'master' into import-thumbnail