Multi-threaded rendering & add option to set max thread count
Merge remote-tracking branch 'upstream/master'