Merge branch 'release/v3.1.36' into develop
reintegrated Travis's change
Merge branch 'gh-pages' into develop
v3.1.37
and don't forget the build
Merge branch 'release/v3.1.37' into gh-pages