Updates for 2.5.1 becoming 2.6.0
Merge pull request #598 from bmbouter/updates-for-2-6-release-stream

Updates for 2.5.1 becoming 2.6.0