Merge branch '1.x'
Merge pull request #7030 from Elgg/1.x

Merge 1.x up to master
Merge pull request #7181 from Elgg/1.x

Merging 1.x into master
Merge remote-tracking branch 'remotes/origin/master' into 1.x
inititial commit
inititial commit
russian language