Merge branch 'hotfix/1.1.26' v1.1.26
authorIan Weller <ian@gaslightmedia.com>
Thu, 29 Jun 2017 18:07:33 +0000 (14:07 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 29 Jun 2017 18:07:33 +0000 (14:07 -0400)

Trivial merge