Merge branch 'hotfix/1.1.26' v1.1.26
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 30 Dec 2015 21:17:16 +0000 (16:17 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 30 Dec 2015 21:17:16 +0000 (16:17 -0500)

Trivial merge