Merge branch 'release/1.0.5' v1.0.5
authorLaury GvR <laury@gaslightmedia.com>
Fri, 13 Oct 2017 21:17:20 +0000 (17:17 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 13 Oct 2017 21:17:20 +0000 (17:17 -0400)

Trivial merge