merge pik modifications to stable versions of PISM.