Merge branch 'release/1.0.5' v1.0.5
authorLaury GvR <laury@gaslightmedia.com>
Mon, 27 Aug 2018 17:48:25 +0000 (13:48 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 27 Aug 2018 17:48:25 +0000 (13:48 -0400)

Trivial merge