Merge branch 'hotfix/1.0.2' v1.0.2
authorIan Weller <ian@gaslightmedia.com>
Wed, 22 Jun 2016 14:49:32 +0000 (10:49 -0400)
committerIan Weller <ian@gaslightmedia.com>
Wed, 22 Jun 2016 14:49:32 +0000 (10:49 -0400)

Trivial merge