Merge branch 'hotfix/1.1.1' master v1.1.1
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 8 Mar 2018 19:01:11 +0000 (14:01 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 8 Mar 2018 19:01:11 +0000 (14:01 -0500)

Trivial merge