Merge branch 'master' into unstable

This commit is contained in:
Julien Duponchelle 2015-06-26 14:42:43 +02:00
commit 90b0dfebbd