Merge pull request #1273 from joelmartinez/docs-unified-fix