Merge pull request #814 from nupplaphil/6691-rendertime-fix