[chaley]

Here is the list of changes between the current version and @jackie_w's file, in the form if a "patch" file.

I decided to up the version to 2.6.0 instead of 2.5.2.

Let me know if I should create the git pull request for @kovid.