This was originally a staging PR, but vanilla staged it before the PR
was processed.  He missed the WWW update though, so I'll do that now.

PR:		193060
Submitted by:	turutani