No reason to change that...
Merge branch 'master' of https://github.com/highfidelity/hifi into tot
More debugging of the FBXReader in order to understand how to interpret the material fields
Display "--" for ping values if not yet valid
Use valid font for Windows so that '-'s are displayed
Update extra entity tool stretch handles to be optionally visible
Update entity tool grabbers look and size
Add borderSize to Cube3DOverlay
Update color used for Cube3DOverlay border
Update rotation handles to drawInFront = true
Update border comment in Cube3DOverlay
Merge pull request #3864 from huffman/entity-tools-front-draw

Update entity tools to draw grabbers in front
Merge branch 'master' of https://github.com/highfidelity/hifi into tot
hack a separate emissive information in the g-buffer
hack a separate emissive information in the g-buffer
Merge pull request #3865 from ctrlaltdavid/20197

CR for Job #20197 - Bug: Initial ping stats mis-reported
Merge branch 'master' of https://github.com/highfidelity/hifi into tot
don't lookup entity when deleting script
fix typo from overwrite of gverb/readme.txt
Merge pull request #3867 from AndrewMeadows/bispinor

don't lookup entity by ID when deleting script