Bringing up to R 3.1.1