Merge branch 'release-2.5.2' into develop

This commit is contained in:
Hillel Coren 2016-05-10 21:41:30 +03:00
commit 9d906299f3