Merge branch 'hotfix/1.1.6' v1.1.6
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 22 May 2018 18:25:09 +0000 (14:25 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 22 May 2018 18:25:09 +0000 (14:25 -0400)

Trivial merge