Merge branch 'release/1.0.5' v1.0.5
authorLaury GvR <laury@gaslightmedia.com>
Thu, 23 Aug 2018 16:35:50 +0000 (12:35 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 23 Aug 2018 16:35:50 +0000 (12:35 -0400)

Trivial merge