Merge pull request #3124 from haraldg/elektra