Remove spurious error messages
Merge pull request #319 from julry/cleanup_build

Remove spurious error messages
Merge branch 'upstream-develop' into develop

Merging in all upstream changes.