added test for #1767
Fixed #1767
Merge branch 'develop' into ojii-fix-1767

Conflicts:
	cms/tests/i18n.py
merge fix
Merge pull request #2886 from digi604/fix-1767

Fix 1767