Unity modified the ProjectSettings just committing those changes
Merge remote-tracking branch 'team/master'
Merge remote-tracking branch 'team/master'
Fixed a typo in Rachid's commit