cleanup warnings when building w/ clang
Merge branch 'devel' of ccs-dev-fe:scout into devel
arm: lost some stuff in merge