Merge "Use 'stat' package instead of literals for mkdir()"