Fixed blackness not rendering sometimes
Merge branch 'master' into 2spooky