This has been fixed in master already and partially caused the conflict.