Update server for docs deployment.
Merge pull request #3452 from nawroth/1.9-maint

Update server for docs deployment.
Merge branch '1.9-maint' into 2.0-maint