Merge branch 'topic/gcc47_fixes'
Fix compile error with log level TRACE
Merge branch 'topic/log_fix' into develop