Merge commit '3.20110715' into prv/po