'merged' changes from https://svn.mpi.nl/LAT/Arbil/branches/arbil.2.6.x/ r42922