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

Conflicts:
	Language/Words.php
	Language/Words_FR.php

bogue