Let's target the correct branch this time, shall we?
See !414 (merged)
merged
mentioned in commit fa36b8f5