[patch] Backport r226026 and r226031 to 3.6. Fixes pr22351.

Wed Jan 28 10:56:58 PST 2015

Committed as r227344.

On 28 January 2015 at 17:53, Hans Wennborg <hans at chromium.org> wrote:
> Looks good to me, please commit on the branch (or let me know if you'd
> like me to do it).
>
> Thanks for fixing!
>
>  - Hans
>
> On Wed, Jan 28, 2015 at 8:58 AM, Rafael Espíndola
> <rafael.espindola at gmail.com> wrote:
>>
>> Cheers,
>> Rafael