Revert "Merge origin/master"

This reverts commit 89a4944b7cea1fd480da8994cf7a7daf5480c868.
first commit from win8