Merge branch 'hotfix/1.0.1' v1.0.1
authorIan Weller <ian@gaslightmedia.com>
Thu, 15 Sep 2016 12:35:59 +0000 (08:35 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 15 Sep 2016 12:35:59 +0000 (08:35 -0400)

Trivial merge