Merge branch 'hotfix/1.0.5' v1.0.5
authorLaury GvR <laury@gaslightmedia.com>
Fri, 16 Jun 2017 18:18:06 +0000 (14:18 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 16 Jun 2017 18:18:06 +0000 (14:18 -0400)

Trivial merge