merge updates from Unidata master