Merge pull request #2398 from haraldg/elektra