16 Dec Snapshot
Merge remote-tracking branch 'remotes/his/master'

Conflicts:
	translations/fet_ar.ts
	translations/fet_ca.ts
	translations/fet_de.ts
	translations/fet_el.ts
	translations/fet_es.ts
	translations/fet_fa.ts
	translations/fet_fr.ts
	translations/fet_gl.ts
	translations/fet_id.ts
	translations/fet_it.ts
	translations/fet_lt.ts
	translations/fet_ru.ts
	translations/fet_sk.ts
	translations/fet_sq.ts
	translations/fet_sr.ts
	translations/fet_uk.ts
	translations/fet_uz.ts
	translations/fet_vi.ts