Merge branch 'hotfix/1.2.26' v1.2.26
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 29 Jul 2016 20:15:24 +0000 (16:15 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 29 Jul 2016 20:15:24 +0000 (16:15 -0400)

Trivial merge