Merge branch 'hotfix/1.0.24' v1.0.24
authorIan Weller <ian@gaslightmedia.com>
Fri, 23 Sep 2016 14:44:43 +0000 (10:44 -0400)
committerIan Weller <ian@gaslightmedia.com>
Fri, 23 Sep 2016 14:44:43 +0000 (10:44 -0400)

Trivial merge