Merge branch 'james-dev' into 'master'

Fix for os detection

See merge request !15
4 jobs for master in 4 seconds (queued for 1 second)
Status Job ID Name Coverage
  Set Env
passed set-pypirc #3598
storjapi

00:00:01

 
  Deploy
passed deploy-production #3599
storjapi

00:00:02

 
  Cleanup
passed cleanup_pypirc #3600
storjapi

00:00:00

 
  Db
passed update_db #3601
storjapi

00:00:00