Required for !2060 (merged)
>uguu
Feel free to merge that, it's non-reviewable anyway :D
merged
mentioned in commit 8ad6d278
