829f56a020
Original author: romainguy Merged from: //branches/cupcake/... Automated import of CL 143187
Original author: romainguy Merged from: //branches/cupcake/... Automated import of CL 143187