Merge branch 'hotfix/1.0.1'
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 22 Oct 2015 12:49:07 +0000 (08:49 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 22 Oct 2015 12:49:07 +0000 (08:49 -0400)

Trivial merge