Merge branch 'saruman_thread' of https://github.com/ArthurStam/kupaka in...

...to bumblebee