Backed out changeset efb0cf8c2db9

issue3979

--HG--
branch : 2.6
merge

--HG--
branch : 2.6