merged
By David Hrbáč on 2017-02-16T08:50:07 (imported from GitLab project)
mentioned in commit c0c1b808