Merge branch 'hotfix/1.0.1' v1.0.1
authorIan Weller <ian@gaslightmedia.com>
Wed, 27 Jul 2016 18:11:22 +0000 (14:11 -0400)
committerIan Weller <ian@gaslightmedia.com>
Wed, 27 Jul 2016 18:11:22 +0000 (14:11 -0400)

Trivial merge