Fix regression due to temporary removal of sensibal config items in profiler output
Merge branch 'master/chiba' of git://github.com/novius-os/core into master/chiba
Merge branch 'master/chiba' into master/chiba2