Small fix to handle default condition detected clang
Sync with master before sending local fixes.
Merge branch 'master' of git://github.com/antelopeusersgroup/antelope_contrib