Merge remote branch 'remotes/origin/bug_597_crashlog_show_skinname'