Merging new nightscout master