New commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	Language/Words.php

Mise à jour