Merge latest nightscout:dev into scottleibrand:wip/iob-cob (via nightscout:wip/iob-cob)