Merge remote-tracking branch 'origin/master' into rendering
move whiteknight single - render bunny, stuff
fixes
Merge branch 'rendering'