Merge branch 'release/v1.0.0' into develop
authorChocobozzz <me@florianbigard.com>
Mon, 8 Oct 2018 10:04:52 +0000 (12:04 +0200)
committerChocobozzz <me@florianbigard.com>
Mon, 8 Oct 2018 10:04:52 +0000 (12:04 +0200)

Trivial merge