Backport of !45 (merged)
assigned to @daissi
enabled an automatic merge when all merge checks for b564859d pass
merged