Merge pull request #798 from jmaas/release26

Fix merge error