Merge "Bug 1280: Added option to automaticly create parents"