Merge remote-tracking branch 'XTUPLE/master'
Merge remote-tracking branch 'XTUPLE/dev-1-3-6'
Changes to docs
Changes to docs
Merge remote-tracking branch 'XTUPLE/master'
Merge remote-tracking branch 'XTUPLE/master'
Merge remote-tracking branch 'XTUPLE/dev-1-3-6'
Merge pull request #458 from lynnaloo/doc_changes

Doc changes