Merge branch 'hotfix/1.1.8' v1.1.8
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 8 Jun 2018 13:01:06 +0000 (09:01 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 8 Jun 2018 13:01:06 +0000 (09:01 -0400)

Trivial merge