Merge branch 'release/v1.3.7' into develop
fix for travis
Merge branch 'develop'