1.2.x

Port the fix from master and clean a warning.