CHG: Sync with svn: Protect multi-threaded GUI updates