Latest changes from SharpDX...