Redo on the installation page
Merge remote-tracking branch 'origin/master'

Conflicts:
	doc/installation/windows/installation_windows.md