Merge change in offical SharpDX