Merge "Fix bug 807"
authorJames Zern <jzern@google.com>
Fri, 8 Aug 2014 02:54:53 +0000 (19:54 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Fri, 8 Aug 2014 02:54:53 +0000 (19:54 -0700)

Trivial merge