Merge branch 'release/1.0.11' v1.0.11
authorLaury GvR <laury@gaslightmedia.com>
Mon, 7 May 2018 17:09:19 +0000 (13:09 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 7 May 2018 17:09:19 +0000 (13:09 -0400)

Trivial merge