Manually porting changes in documentation

pulling individual changes from the master commit into develop.