Merge branch 'hotfix/1.1.25' v1.1.25
authorIan Weller <ian@gaslightmedia.com>
Thu, 29 Jun 2017 17:49:18 +0000 (13:49 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 29 Jun 2017 17:49:18 +0000 (13:49 -0400)

Trivial merge