Change that should conflict with upstream changes (for now)

Upstreamed from https://bugzilla.mozilla.org/show_bug.cgi?id=1102907
Merge pull request #20 from jgraham/sync_e4f9413dd7ca6774a7f8ab9ab3e21a23a9ec6f0f

Merge pull request #20 from sync_e4f9413dd7ca6774a7f8ab9ab3e21a23a9ec6f0f