Merge pull request #1 from pagespeed/oschaaf-patch

Apply upstream change