+ Merge
+ Bug fix: wrong parameter was passed in thread local storage
Merge branch 'workshop' of github.com:MrKepzie/Natron into workshop