Merge branch 'hotfix/1.1.26' v1.1.26
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 14 Jul 2017 16:26:44 +0000 (12:26 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 14 Jul 2017 16:26:44 +0000 (12:26 -0400)

Trivial merge