[18:40:56] Anyone want to merge https://gerrit.wikimedia.org/r/578084 to fix a class name conflict?