Merge 2.5 into 2.6

[acolwell]

Thanks for submitting a pull request! Please provide enough information so that others can review your pull request. Additionally, make sure you've done all of these things:

• [x] I've followed the contributing guidelines to the best of my understanding
• [x] I've read and understood the contributing guidelines
• [x] I've formatted my code according to Natron's code style
• [x] I've searched the pull requests tracker to ensure that this PR is not a duplicate

PR Description

What type of PR is this? (Check one of the boxes below)

• [ ] Bug fix (non-breaking change which fixes an issue)
• [ ] New feature (non-breaking change which adds functionality)
• [x] Improvement (non-breaking change which does not add functionality nor fixes a bug but improves Natron in some way)
• [ ] Breaking change (fix or feature that would cause existing functionality to change)
• [ ] My change requires a change to the documentation
  • [ ] I have updated the documentation accordingly

What does this pull request do?

Merges changes to RB-2.5 to RB-2.6

Have you tested your changes (if applicable)? If so, how?

Yes. I've verified the tests still pass and the windows installer still builds. I verified the windows installer works and indicates it is a 2.6 build.