Merging latest API changes from nightscout repo