Debug console merge cleanup. Proper merge of debug_console commits (from antipodes) into master.