Merge branch 'hotfix/1.1.24' v1.1.24
authorIan Weller <ian@gaslightmedia.com>
Thu, 29 Jun 2017 17:03:15 +0000 (13:03 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 29 Jun 2017 17:03:15 +0000 (13:03 -0400)

Trivial merge