Merge branch 'hotfix/1.0.5' v1.0.5
authorLaury GvR <laury@gaslightmedia.com>
Wed, 5 Jul 2017 13:56:43 +0000 (09:56 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 5 Jul 2017 13:56:43 +0000 (09:56 -0400)

Trivial merge