Merge branch 'hotfix/1.0.2' v1.0.2
authorIan Weller <ian@gaslightmedia.com>
Mon, 24 Apr 2017 12:57:05 +0000 (08:57 -0400)
committerIan Weller <ian@gaslightmedia.com>
Mon, 24 Apr 2017 12:57:05 +0000 (08:57 -0400)

Trivial merge