Merge branch 'hotfix/1.0.11' v1.0.11
authorLaury GvR <laury@gaslightmedia.com>
Fri, 18 Aug 2017 13:47:58 +0000 (09:47 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 18 Aug 2017 13:47:58 +0000 (09:47 -0400)

Trivial merge