fix for non-rendering.
Merge remote-tracking branch 'origin/master'