Merge origin/VanRay into VanRay