Merge branch 'release/v1.0.0' into develop
authorChocobozzz <me@florianbigard.com>
Fri, 19 Oct 2018 11:48:07 +0000 (13:48 +0200)
committerChocobozzz <me@florianbigard.com>
Fri, 19 Oct 2018 11:48:07 +0000 (13:48 +0200)

Trivial merge