Merge into my branch from nightscout master