Merge branch 'hotfix/1.0.7' v1.0.7
authorIan Weller <ian@gaslightmedia.com>
Thu, 22 Sep 2016 19:12:12 +0000 (15:12 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 22 Sep 2016 19:12:12 +0000 (15:12 -0400)

Trivial merge