Merge branch '1.5' into 2.0

This commit is contained in:
Julien Duponchelle 2016-05-11 16:16:29 +02:00
commit 95d2bd0065
No known key found for this signature in database
GPG Key ID: CE8B29639E07F5E8