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)