e4fa1fc0

Author: Michael Lynch <git@mtlynch.io>

Merge origin/master into perf-improve