Merge branch 'hotfix/1.0.2' v1.0.2
authorIan Weller <ian@gaslightmedia.com>
Tue, 20 Sep 2016 15:21:09 +0000 (11:21 -0400)
committerIan Weller <ian@gaslightmedia.com>
Tue, 20 Sep 2016 15:21:09 +0000 (11:21 -0400)

Trivial merge