Updated to according to comments for PR#1001.
Updated to according to comments for PR#1001.

gfx-rs/gfx-rs,tanderegg/gfx,tanderegg/gfx,ColinKinloch/gfx,sectopod/gfx-rs,JohnColanduoni/gfx,JohnColanduoni/gfx,ColinKinloch/gfx,Bastacyclop/gfx,davll/gfx