update master to 1.7 from Ephys