Merge branch 'doruq-patch-1' into develop

This commit is contained in:
yago 2015-02-11 21:58:37 +01:00
commit 3d0b3a64f8