Merge upload-module-dir into master.