Merge branch 'hotfix/1.0.27' v1.0.27
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 28 Dec 2017 20:25:39 +0000 (15:25 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 28 Dec 2017 20:25:39 +0000 (15:25 -0500)

Trivial merge