added missing return that caused clang exe to fail at runtime
Merge branch 'rwcarlsen-fix' into develop