Fixing BikeOS, again
Merge branch 'master' into RESULTS_BRANCH