800452873e
Original author: mathias Merged from: //branches/cupcake/... Automated import of CL 143161
Original author: mathias Merged from: //branches/cupcake/... Automated import of CL 143161