DirectX Light
Merge branch 'Erik' into Windows