Merge branch 'release/1.1.2' v1.1.2
authorLaury GvR <laury@gaslightmedia.com>
Mon, 25 Sep 2017 16:46:07 +0000 (12:46 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 25 Sep 2017 16:46:07 +0000 (12:46 -0400)

Trivial merge