Merge branch 'hotfix/1.0.26' 1.0.26
authorIan Weller <ian@gaslightmedia.com>
Wed, 10 Aug 2016 19:35:22 +0000 (15:35 -0400)
committerIan Weller <ian@gaslightmedia.com>
Wed, 10 Aug 2016 19:35:22 +0000 (15:35 -0400)

Trivial merge