Merge branch 'master' into develop
Threads can be detached now
Merge branch 'develop'