merged
By David Hrbáč on 2017-04-25T12:45:16 (imported from GitLab project)
mentioned in commit 4415af9a