Merge branch 'hotfix/1.0.1' v1.0.1
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 26 Oct 2015 12:57:53 +0000 (08:57 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 26 Oct 2015 12:57:53 +0000 (08:57 -0400)

Trivial merge