Merge branch 'hotfix/1.5.26' v1.5.26
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 7 Sep 2016 12:25:20 +0000 (08:25 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 7 Sep 2016 12:25:20 +0000 (08:25 -0400)

Trivial merge