fix wn8 step 3
Merge branch 'master' into HEAD