fix threading race condition
Merge branch 'master' of github.com:Floobits/floobits-intellij