merged updates from devel
merged updates from devel

MengjiaoH/ospray,ospray/OSPRay,Twinklebear/OSPRay,MengjiaoH/ospray,favreau/OSPRay,wilsonCernWq/ospray,ospray/OSPRay,ospray/OSPRay,wilsonCernWq/ospray,favreau/OSPRay,Twinklebear/OSPRay,wilsonCernWq/ospray,ospray/OSPRay,Twinklebear/OSPRay,Twinklebear/OSPRay,MengjiaoH/ospray,MengjiaoH/ospray,favreau/OSPRay,favreau/OSPRay,MengjiaoH/ospray