Merge branch 'hotfix/1.0.23' v1.0.23
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 11 Jul 2017 17:17:44 +0000 (13:17 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 11 Jul 2017 17:17:44 +0000 (13:17 -0400)

Trivial merge