importing rev 42535 from 1.2 (which by mistake was actually imported from svn trunk)