Merge tag 'v1.0.5' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 9 Jan 2018 23:16:46 +0000 (18:16 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 9 Jan 2018 23:16:46 +0000 (18:16 -0500)
v1.0.5


Trivial merge