Merge branch 'hotfix/1.1.28' v1.1.28
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 30 Oct 2017 17:26:14 +0000 (13:26 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 30 Oct 2017 17:26:14 +0000 (13:26 -0400)

Trivial merge