backport r43501 and r43503
added mkmf to .gitignore