Merge pull request #3591 from haraldg/elektra