Merge branch 'release/1.0.5' v1.0.5
authorLaury GvR <laury@gaslightmedia.com>
Tue, 9 Jan 2018 23:16:42 +0000 (18:16 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 9 Jan 2018 23:16:42 +0000 (18:16 -0500)

Trivial merge