Tweaking Microsoft trademarks
Merge remote-tracking branch 'github/gh-pages' into gh-pages