Code review request

```
Purpose of code changes on this branch:


When reviewing my code changes, please focus on:


After the review, I'll merge this branch into:
/trunk


```

Original issue reported on code.google.com by `patriciamariarodriguezgracia@gmail.com` on 27 May 2014 at 2:57
