Merge remote-tracking branch 'dechamps/ipip' into 1.1