Merge branch 'hotfix/1.2.26' v1.2.26
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 11 May 2017 16:10:15 +0000 (12:10 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 11 May 2017 16:10:15 +0000 (12:10 -0400)

Trivial merge