Merge branch 'hotfix/1.0.2' v1.0.2
authorIan Weller <ian@gaslightmedia.com>
Thu, 22 Sep 2016 12:45:10 +0000 (08:45 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 22 Sep 2016 12:45:10 +0000 (08:45 -0400)

Trivial merge