Merge branch 'develop' into release/1.0.5
authorLaury GvR <laury@gaslightmedia.com>
Tue, 13 Mar 2018 21:36:00 +0000 (17:36 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 13 Mar 2018 21:36:00 +0000 (17:36 -0400)

Trivial merge