Merge branch 'hotfix/1.0.11'
authorLaury GvR <laury@gaslightmedia.com>
Fri, 2 Mar 2018 22:41:49 +0000 (17:41 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 2 Mar 2018 22:41:49 +0000 (17:41 -0500)

Trivial merge