Fabio Erculiani Mon, 16 Jul 2012 15:50:09 -0700
Ok, I cherry-picked 91f68c89d8f35fe98ea04159b9a3b42d0149478f after having merged v3.4.5
-- Fabio Erculiani