Merge branch 'develop' into Eole

This commit is contained in:
Eole 2016-01-26 10:35:02 +01:00
commit a3ae22549e