Merging changes (documentation) from master.