Merge from YafaRayforXSI master