The real real fix to the image build problem
Merge branch 'master' of github.com:wesleycho/saam