Merge tag '3.20120202' into trail3-integrated