border case again
Merge remote-tracking branch 'origin/stable'
border case again
stronger locale generation
bugfix mirrors
Merge remote-tracking branch 'origin/master' into stable