Don't fail if asked to truncate a reference. And go to having a catch-all case.
Oops
Merge bug26236
stable to default