Updated to make Docset install optional.
Merge branch 'release/1.1.8'