More updates for the upcoming 2.6 release
Merge pull request #43 from jmaas/master

More updates for the upcoming 2.6 release