Merge "Add -p support to mkdir"