Changes up to point of Ubuntu failure of 28 Aug 2013