Backed out changeset ccedb8b1cefc (bug 817194)
Backed out changeset 8fa0cbe4a54d (bug 817194) for build failures
Automatic merge