Merge branch 'hotfix/1.1.2' v1.1.2
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 2 Apr 2018 17:34:57 +0000 (13:34 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 2 Apr 2018 17:34:57 +0000 (13:34 -0400)

Trivial merge