* Bugfixed locale modification
Merge remote-tracking branch 'upstream/master'

Conflicts:
	install-remote.sh