Merge branch 'release/1.0.11' v1.0.11
authorLaury GvR <laury@gaslightmedia.com>
Thu, 31 May 2018 20:40:16 +0000 (16:40 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 31 May 2018 20:40:16 +0000 (16:40 -0400)

Trivial merge