Reverted spinner, added threads_enter/leave wrapping for non-gtk threads
Merge remote-tracking branch 'origin/test'