Comment 4 for bug 1519748

Change abandoned by Adrian Otto (<email address hidden>) on branch: master
Reason: I am marking this as abandoned due to inactivity. Please do un-abandon this patch, and resubmit a new patch set to address the issue with the merge conflict. Please let me know if there is anything I can do to help.