Merge branch 'release/1.1.1' v1.1.1
authorLaury GvR <laury@gaslightmedia.com>
Wed, 20 Sep 2017 20:50:20 +0000 (16:50 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 20 Sep 2017 20:50:20 +0000 (16:50 -0400)

Trivial merge