Merge "Fix maintainer name"