Merge "Fix .gitmodules (use dublin instead of .)" into dublin