Merge my dev with nightscout dev