My bad, I accidentally merged the previous patch right into master. Amends dfbac0f0
mentioned in merge request !1112 (merged)