Merge branch 'hotfix/1.1.10' v1.1.10
authorLaury GvR <laury@gaslightmedia.com>
Wed, 18 Apr 2018 16:57:03 +0000 (12:57 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 18 Apr 2018 16:57:03 +0000 (12:57 -0400)

Trivial merge