Fixed error output in make.
Merge branch 'test' into dev