Merge branch 'hotfix/1.0.26' v1.0.26
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 21 Oct 2016 17:21:08 +0000 (13:21 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 21 Oct 2016 17:21:08 +0000 (13:21 -0400)

Trivial merge