merge from ContinuumIO master