update from neuralensemble/master