Merge branch 'master' into 1.5

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