merge upstream/master
Changes to allow 1.9 build
Merge pull request #40 from kitsonk/master

Changes to allow Build of 1.9 Documentation