Merge pull request #1039 from jmaas/release26

Release26