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 `virbon...@gmail.com` on 24 May 2015 at 8:34
