94674a64

By: Michael Lynch <git@mtlynch.io>

Merge origin/master and keep Dockerfile image build