Merge branch 'release/1.3.1' into dev
apparently travisCI reports os_uptime as a float...
minor patch for travis tests
Merge branch 'release/1.3.2'