Merge branch 'hotfix/1.0.1' 1.0.1
authorIan Weller <ian@gaslightmedia.com>
Tue, 21 Jun 2016 15:04:50 +0000 (11:04 -0400)
committerIan Weller <ian@gaslightmedia.com>
Tue, 21 Jun 2016 15:04:50 +0000 (11:04 -0400)

Trivial merge