Merge with develop

--HG--
branch : compatibility-develop
This commit is contained in:
kervala 2015-11-23 16:44:42 +01:00
commit 9dffada687

Binary file not shown.