Merge "Set master as branch in .gitmodules"