Merge pull request #5328 from haraldg/elektra