A few unrelated things when investigating http://jira.diamond.ac.uk/browse/DAWNSCI-890