Merge branch 'refs/heads/master' into EXP-Windows-7-Half-Full-Screen