Manual updates for the upcoming 2.6 release
Merge pull request #50 from jmaas/master

Manual updates for the upcoming 2.6 release