Merge branch 'master' into wip-1.1.0

This commit is contained in:
Julien Deswaef 2018-04-29 18:40:58 -04:00
commit 521bdd2f1e

Diff content is not available