Merge branch 'hotfix/1.1.5' v1.1.5
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 22 May 2018 17:58:10 +0000 (13:58 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 22 May 2018 17:58:10 +0000 (13:58 -0400)

Trivial merge