Upstream changes needed to carry through bug fix in get.data, add.SPELT.data etc.