Merge scottleibrand:wip/iob-cob into nightscout:wip/iob-cob