Merge branch 'master' into translation-ru

Resolves Conflicts:
	_translations/ru.yml
This commit is contained in:
Igor Kuzmenko 2017-07-31 11:14:28 +02:00
commit 865e543bee

Diff content is not available