Merge with develop

--HG--
branch : compatibility-develop
This commit is contained in:
kervala 2016-06-07 20:01:47 +02:00
commit 7ebc0ae072

File diff suppressed because it is too large Load diff