Merge branch 'release/1.0.5' v1.0.5
authorLaury GvR <laury@gaslightmedia.com>
Mon, 4 Jun 2018 20:27:29 +0000 (16:27 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 4 Jun 2018 20:27:29 +0000 (16:27 -0400)

Trivial merge