Merged the patch for bug 697557. Adjusted the results.
Attach a file by drag & drop or click to upload
