Merge branch 'hotfix/travis' into develop
test and doc enhancements
doc update
Merge branch 'develop'