Ok this diff is kind of messed up, as I believe this file exists in master already.